projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
927be2c
86dca39
)
Merge branch 'feature/emoji-in-local-users' into 'develop'
author
kaniini
<nenolod@gmail.com>
Sun, 26 Aug 2018 23:24:41 +0000
(23:24 +0000)
committer
kaniini
<nenolod@gmail.com>
Sun, 26 Aug 2018 23:24:41 +0000
(23:24 +0000)
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
1
2
lib/pleroma/web/activity_pub/views/user_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/common_api/common_api.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/common_api/utils.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/views/user_view.ex
Simple merge
diff --cc
lib/pleroma/web/common_api/common_api.ex
Simple merge
diff --cc
lib/pleroma/web/common_api/utils.ex
Simple merge
projects / akkoma / commitdiff