Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex		2020-07-02 16:36:54 +03:00
..
activity_pub	SideEffects: Refactor.	2020-07-02 09:33:50 +02:00
admin_api	Merge develop	2020-06-23 20:56:55 +03:00
api_spec
auth
common_api	Blocking: Don't federate if the options is set.	2020-06-25 12:03:14 +02:00
feed
instances
mastodon_api	Revert "Merge branch 'avatar-removing' into 'develop'"	2020-07-01 08:51:56 +00:00
media_proxy	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-02 16:36:54 +03:00
metadata
mongooseim
oauth
ostatus
pleroma_api	fix for packs pagination	2020-06-20 10:56:28 +03:00
plugs
preload	Merge branch 'preload-fixups-2' into preloadfixups	2020-06-30 11:40:34 +02:00
push
rich_media
static_fe
streamer	Streamer: Align announce streaming with polling.	2020-07-02 09:50:26 +02:00
twitter_api
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs	Rename user.settings column	2020-06-30 11:50:53 -05:00
node_info_test.exs	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
rel_me_test.exs
uploader_controller_test.exs