From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sat, 18 Apr 2020 06:59:23 +0000 (+0000)
Subject: Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=79445ae5d25d7d0f775107eeede167dfd9aeb1bf;p=akkoma

Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403
---

79445ae5d25d7d0f775107eeede167dfd9aeb1bf