Merge branch 'emoji-in-account-view' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 12 Aug 2018 10:41:30 +0000 (10:41 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 12 Aug 2018 10:41:30 +0000 (10:41 +0000)
commite81f788cb8b3e1f76c473c5d4afc526e5be6076d
tree634ec07a85400f8193c58c63621ecd680521d817
parentafb71b303853a0d675495f0682fc813981baf850
parent37b802682ce1231f99976538a11c1584d48f47f4
Merge branch 'emoji-in-account-view' into 'develop'

Render emoji in user profiles

See merge request pleroma/pleroma!265