2 commits

Author	SHA1	Message	Date
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	2019-10-06 17:12:17 +03:00
Egor Kislitsyn	585bc57edb	Extract media actions from MastodonAPIController to MediaController	2019-10-01 14:36:35 +07:00