From: lain <lain@soykaf.club>
Date: Fri, 31 Jul 2020 15:17:33 +0000 (+0000)
Subject: Merge branch 'revert-1ac0969c' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=8ca993c789fb3d41450419fc49bfa22542368ba8;p=akkoma

Merge branch 'revert-1ac0969c' into 'develop'

Revert "Merge branch 'mrf-silence-2' into 'develop'"

See merge request pleroma/pleroma!2825
---

8ca993c789fb3d41450419fc49bfa22542368ba8