Ivan Tashkinov efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex		2019-09-15 18:52:27 +03:00
..
controllers	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	2019-09-15 18:22:08 +03:00
views
mastodon_api_controller_test.exs	Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs	2019-09-14 10:50:08 +00:00
mastodon_api_test.exs