3 commits

Author	SHA1	Message	Date
Ivan Tashkinov	64095961fe	[#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-02 20:42:40 +03:00
Egor Kislitsyn	e7aef27c00	Fix merge	2019-09-30 19:10:54 +07:00
Egor Kislitsyn	99c5a35890	Extract follow requests actions from MastodonAPIController to FollowRequestController	2019-09-27 14:25:17 +07:00