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)
Fix media proxy config defaults

See merge request pleroma/pleroma!495


Trivial merge