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

Merge branch 'revert-13a7105b' into 'develop'

Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383
---

3677a1e5785e8a753652debf37b2818e622f9ffd