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)
commit55a3a3c3e52247427cf0c5b1ad459e86a2be0097
treee59780987ac02a0ca80ce4231602de978b40f7e4
parent4c4344b7b17a2ddb1c597b059e0a7dcc043e02b2
parent4a487e4d0b744edac0d83306b80e4bd0cdef5358
Merge branch 'emoji-upload' into 'develop'

Updated emoji API endpoints

Closes #1649, #1604, and #1545

See merge request pleroma/pleroma!2179