Haelwenn 79445ae5d2 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

2020-04-18 06:59:23 +00:00

..

gettext

…

repo

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

2020-04-18 06:59:23 +00:00

scrubbers

…

static

pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

2020-04-17 13:22:25 -05:00

templates

…