Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex		2020-10-17 13:12:39 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-17 13:12:39 +03:00
admin_api
api_spec
auth
common_api
fed_sockets
feed
mastodon_api
media_proxy
metadata
o_auth
o_status
pleroma_api
plugs
preload/providers
push
rich_media
static_fe	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-17 13:12:39 +03:00
twitter_api
views
web_finger
chat_channel_test.exs
common_api_test.exs
fallback_test.exs
federator_test.exs
media_proxy_test.exs
metadata_test.exs
mongoose_im_controller_test.exs
node_info_test.exs
rel_me_test.exs
streamer_test.exs
uploader_controller_test.exs
web_finger_test.exs