projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
04c5843
b143694
)
Merge branch 'fix/emoji-picker' into 'develop'
author
eal
<eal@waifu.club>
Tue, 5 Jun 2018 21:18:25 +0000
(21:18 +0000)
committer
eal
<eal@waifu.club>
Tue, 5 Jun 2018 21:18:25 +0000
(21:18 +0000)
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge