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)
commit3ff4a06ebe3b8fc8acaa29da0c9170d006b58987
treedcba1470964c8407e40fb89fa1f9ac2f092f7a12
parentb972b972e00d1528f77fe726e066f35cf1323cb7
parent252e129b1e784147cf29868bcc191f88a9b7d5b9
Merge branch 'features/mastoapi-emoji-categories' into 'develop'

MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365