Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 17 Apr 2020 13:40:25 +0000 (13:40 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 17 Apr 2020 13:40:25 +0000 (13:40 +0000)
commit6936854878860d1f6d04db1cd14a00208c6a5728
tree31848b31d5c8976b8196ebc3d2c62b540e66ac9c
parent09bd1d12c112fe45563c25a76afde65a3381aa26
parent46f051048fb1afb02fe81b872ae9f595f2c5f2c1
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398