From: feld <feld@feld.me>
Date: Tue, 5 Jan 2021 21:16:33 +0000 (+0000)
Subject: Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=5e128a6be30563adc3b8a938aa68d18ac04cdfa0;p=akkoma

Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'

Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219
---

5e128a6be30563adc3b8a938aa68d18ac04cdfa0