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
..
invalidations	fix test	2020-06-18 05:06:28 +03:00
invalidation_test.exs
media_proxy_controller_test.exs	MediaProxy whitelist setting now supports hosts with scheme	2020-07-12 12:41:40 +03:00
media_proxy_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-19 20:05:37 +03:00