Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 3 Jan 2019 22:29:36 +0000 (22:29 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 3 Jan 2019 22:29:36 +0000 (22:29 +0000)
commitccdc916f95d770f43d98cde3ca3d8454c6342a33
treeb41e1d1cff95b529855773eecbd3ac269843bb1e
parenteaaf701319cc3faf49ddcee359c796ec682886d8
parent53f56039e5486e429f3f0675936fc0f28225c272
Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'

Remove media proxy examples in config/config.exs

See merge request pleroma/pleroma!624