kaniini 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop' ... [#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761		2019-10-05 19:28:53 +00:00
..
activity_pub	Merge branch 'accept-embedded-announce-object' into 'develop'	2019-10-05 19:28:29 +00:00
admin_api	Fix merge	2019-09-30 19:10:54 +07:00
auth
common_api	CommonAPI: Create profile updates as public.	2019-10-05 14:53:50 +02:00
instances
mastodon_api	Merge branch 'split-masto-api/leftovers' into 'develop'	2019-10-05 19:28:53 +00:00
media_proxy
metadata
mongooseim
oauth	Send an identifier alongside with error message in OAuthController	2019-10-01 18:10:04 +03:00
ostatus	Merge branch 'features/apc2s-media-upload' into 'develop'	2019-09-30 11:21:49 +00:00
pleroma_api/controllers	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
plugs
push
rich_media
salmon
streamer	tests: streamer: add a test for blocked transitive activities	2019-10-04 15:17:32 +00:00
twitter_api	Fix merge	2019-09-30 19:10:54 +07:00
views
web_finger
websub
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs	Fix credo warning	2019-10-02 21:12:01 +07:00
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs