From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Wed, 10 Jul 2019 15:07:37 +0000 (+0000)
Subject: Merge branch 'features/mastoapi-emoji-categories' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3ff4a06ebe3b8fc8acaa29da0c9170d006b58987;p=akkoma

Merge branch 'features/mastoapi-emoji-categories' into 'develop'

MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365
---

3ff4a06ebe3b8fc8acaa29da0c9170d006b58987