Merge branch 'patch-2' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 9 Jul 2020 09:50:08 +0000 (09:50 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 9 Jul 2020 09:50:08 +0000 (09:50 +0000)
commit34d6009d82ef8949d689ed1f7c4ec2c2fad254c7
tree834f2d8946697f7c4b3474062ed2f4cb8e9ed9b4
parent393a588265d6e272c22ce92f338ab8853814316f
parentab773fa5c946f74b0f42106ba2e72c092566743a
Merge branch 'patch-2' into 'develop'

fix wide2x emojis within nicknames

See merge request pleroma/pleroma!2737