projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0ab563d
b57b430
)
Merge branch 'fix/emoji-api-nonsense' into 'develop'
author
lambda
<lain@soykaf.club>
Wed, 10 Apr 2019 06:22:51 +0000
(06:22 +0000)
committer
lambda
<lain@soykaf.club>
Wed, 10 Apr 2019 06:22:51 +0000
(06:22 +0000)
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
1
2
docs/api/pleroma_api.md
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/controllers/util_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/util_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
docs/api/pleroma_api.md
Simple merge
diff --cc
lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge
diff --cc
test/web/twitter_api/util_controller_test.exs
Simple merge
projects / akkoma / commitdiff