Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs		2020-07-19 20:05:37 +03:00
..
controllers	MastoAPI: fix & test giving MRF reject reasons	2020-07-15 15:25:33 +02:00
views	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-19 20:05:37 +03:00
mastodon_api.ex	NotificationController: Don't return chat_mentions by default.	2020-06-02 14:05:53 +02:00
websocket_handler.ex	Expand and authorize streams in Streamer directly	2020-05-12 18:04:47 +02:00