Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
authorfeld <feld@feld.me>
Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)
committerfeld <feld@feld.me>
Fri, 2 Aug 2019 17:07:09 +0000 (17:07 +0000)
commit5eec0abe09ad49ffe7ff986ab28f54bddd6f3499
treef4e1af0a781f7fef4523122bafd1cf19ff95d6ba
parent5ff8f07ca906d77a6ec1d5ba912a787f855364f9
parentd93d7779151c811e991e99098e64c1da2c783d68
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'

Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486