Merge branch 'feature/emoji-in-local-users' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 23:24:41 +0000 (23:24 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 23:24:41 +0000 (23:24 +0000)
commit63094cfd3ec0a9ca6e17a3ba6fa8271050cfb9b0
treeaf47338befa0fc1d54bd6076c7aaba4bd0e10357
parent927be2c62b40fafdfd3eabba768bccf428d4c74d
parent86dca3964084c3c1b1a9c0d051ac5e214ff03c94
Merge branch 'feature/emoji-in-local-users' into 'develop'

Add emoji to local user profiles.

Closes #202

See merge request pleroma/pleroma!271
lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex