Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
authorfeld <feld@feld.me>
Tue, 5 Jan 2021 21:16:33 +0000 (21:16 +0000)
committerfeld <feld@feld.me>
Tue, 5 Jan 2021 21:16:33 +0000 (21:16 +0000)
commit5e128a6be30563adc3b8a938aa68d18ac04cdfa0
tree29d949e5792d8218e35b73baa306c6b1bc2067ee
parent18296c74736fbf020c5bb99491b9c0288a687043
parent50e226bc528a05157a310f0441d2f6e4cb84f212
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'

Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219