From: kaniini <nenolod@gmail.com>
Date: Thu, 3 Jan 2019 22:29:36 +0000 (+0000)
Subject: Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ccdc916f95d770f43d98cde3ca3d8454c6342a33;hp=-c;p=akkoma

Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'

Remove media proxy examples in config/config.exs

See merge request pleroma/pleroma!624
---

ccdc916f95d770f43d98cde3ca3d8454c6342a33