From: feld <feld@feld.me>
Date: Fri, 10 Jul 2020 16:38:05 +0000 (+0000)
Subject: Merge branch 'chore/should-document-that' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=76f5f617138300cbc8c552d1bfb7bbfb9a5178b2;p=akkoma

Merge branch 'chore/should-document-that' into 'develop'

Probably worth documenting the MediaProxy fix

See merge request pleroma/pleroma!2750
---

76f5f617138300cbc8c552d1bfb7bbfb9a5178b2