From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Mon, 28 Dec 2020 12:12:19 +0000 (+0000)
Subject: Merge branch 'revert-b122b6ff' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=607cac1947aaec9ab66de679615b4e14548027a8;p=akkoma

Merge branch 'revert-b122b6ff' into 'develop'

Revert "Merge branch 'features/hashtag-column' into 'develop'"

See merge request pleroma/pleroma!3222
---

607cac1947aaec9ab66de679615b4e14548027a8