Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 18 Apr 2020 06:59:23 +0000 (06:59 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 18 Apr 2020 06:59:23 +0000 (06:59 +0000)
commit79445ae5d25d7d0f775107eeede167dfd9aeb1bf
tree846c2e638e922623aa399d96d9eda79691602512
parentf1843db41d27c695b4fdb92b13fe6642102a35bc
parentd698ecef9b5ede19474f1a45b776f8ad9f8b7678
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