Merge branch 'features/mastoapi-emoji-categories' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 10 Jul 2019 15:07:37 +0000 (15:07 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 10 Jul 2019 15:07:37 +0000 (15:07 +0000)
MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365


Trivial merge