Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 18 Aug 2020 15:02:09 +0000 (18:02 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 18 Aug 2020 15:02:09 +0000 (18:02 +0300)
1  2 
.gitlab-ci.yml
config/config.exs
lib/pleroma/web/media_proxy/media_proxy.ex

diff --cc .gitlab-ci.yml
Simple merge
Simple merge