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

..

fallback_controller.ex

Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController

2019-08-26 19:16:40 +07:00

list_controller.ex

[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).

2019-09-15 18:22:08 +03:00

mastodon_api_controller.ex

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

2019-09-15 18:52:27 +03:00

search_controller.ex

[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).

2019-09-15 18:22:08 +03:00

subscription_controller.ex

[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).

2019-09-15 18:22:08 +03:00