From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Thu, 30 Apr 2020 16:09:51 +0000 (+0000)
Subject: Merge branch 'emoji-upload' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=55a3a3c3e52247427cf0c5b1ad459e86a2be0097;p=akkoma

Merge branch 'emoji-upload' into 'develop'

Updated emoji API endpoints

Closes #1649, #1604, and #1545

See merge request pleroma/pleroma!2179
---

55a3a3c3e52247427cf0c5b1ad459e86a2be0097