From: lain <lain@soykaf.club>
Date: Tue, 14 Apr 2020 16:32:34 +0000 (+0000)
Subject: Merge branch 'revert-60cc7d6c' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c02e6ceea567b3ae7a5492ebd4d0babb798a13b4;p=akkoma

Merge branch 'revert-60cc7d6c' into 'develop'

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

See merge request pleroma/pleroma!2384
---

c02e6ceea567b3ae7a5492ebd4d0babb798a13b4