Merge branch 'fix-media-proxy-defaults' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 3 Dec 2018 16:14:58 +0000 (16:14 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 3 Dec 2018 16:14:58 +0000 (16:14 +0000)
commit42ef7cd227ba075fbd05e9625dc880feddee4417
treeaffd2cc83846f64b0c01102f661eba3d2a8cfcec
parenta3f9cca78c16026025f0cbadc50c7683d7444e86
parent43d5e4f7fa4cfe9da8b3969847a1132e62a9e68b
Merge branch 'fix-media-proxy-defaults' into 'develop'

Fix media proxy config defaults

See merge request pleroma/pleroma!495