distraction.party/lib/pleroma/web/mastodon_api
Ivan Tashkinov 01c1078015 [#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
2019-09-17 22:53:26 +03:00
..
controllers [#1234] Defined admin OAuth scopes, refined other scopes. Added tests. 2019-09-17 22:19:39 +03:00
views Merge branch 'patch-5' into 'develop' 2019-09-11 17:47:19 +00:00
mastodon_api.ex tests for /web/mastodon_api/mastodon_api.ex 2019-08-13 21:12:37 +00:00
websocket_handler.ex Revert "Merge branch 'revert-4fabf83a' into 'develop'" 2019-09-16 17:55:04 +07:00