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
..
activity_pub	Fix warning in TransmogrifierTest	2019-09-30 19:10:56 +07:00
admin_api	Fix merge	2019-09-30 19:10:54 +07:00
auth
common_api	common api: implement scrobbling	2019-09-30 10:39:17 +00:00
instances
mastodon_api	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
media_proxy
metadata
mongooseim
oauth	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
ostatus	Merge branch 'features/apc2s-media-upload' into 'develop'	2019-09-30 11:21:49 +00:00
pleroma_api/controllers	Extract mascot actions from MastodonAPIController to MascotController	2019-09-30 19:32:43 +07:00
plugs
push
rich_media
salmon
streamer
twitter_api	[#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
web_finger
websub
fallback_test.exs
federator_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs