Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships		2019-10-24 14:55:36 +07:00
..
activity_pub	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
admin_api	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
auth
common_api
feed
instances
mastodon_api	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
media_proxy
metadata
mongooseim
oauth
ostatus
pleroma_api/controllers	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
plugs
push	Spelling	2019-10-21 18:35:43 -05:00
rich_media
streamer	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
twitter_api	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
views
web_finger
fallback_test.exs
federator_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs