From: rinpatch <rinpatch@sdf.org>
Date: Thu, 21 Nov 2019 15:20:05 +0000 (+0000)
Subject: Merge branch 'revert-5c6c3026' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dedb1ad5d68406bf16ac47d5ad7d2c12f97a10b4;p=akkoma

Merge branch 'revert-5c6c3026' into 'develop'

Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002
---

dedb1ad5d68406bf16ac47d5ad7d2c12f97a10b4