projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18296c7 50e226b)
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)
Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git