projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c4344b 4a487e4)
Merge branch 'emoji-upload' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 30 Apr 2020 16:09:51 +0000 (16:09 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 30 Apr 2020 16:09:51 +0000 (16:09 +0000)
Updated emoji API endpoints

Closes #1649, #1604, and #1545

See merge request pleroma/pleroma!2179


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git