From: lain <lain@soykaf.club>
Date: Mon, 10 Aug 2020 13:59:38 +0000 (+0000)
Subject: Merge branch 'revert-a6d3bb5f' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=93fbf399543fead24f8066d0cba33a0a51b89dd3;p=akkoma

Merge branch 'revert-a6d3bb5f' into 'develop'

Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868
---

93fbf399543fead24f8066d0cba33a0a51b89dd3