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
..
controllers	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
views	Fix merge	2019-09-30 19:10:54 +07:00
mastodon_api_controller_test.exs	Extract mascot actions from MastodonAPIController to MascotController	2019-09-30 19:32:43 +07:00
mastodon_api_test.exs	Revert subscription refactoring.	2019-09-29 18:43:27 +03:00