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] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-09-15 18:52:27 +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	MastoAPI Streaming: Keep compatibility with access_token	2019-07-07 08:49:29 +02:00