Merge branch 'rework-emoji-management' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 22 Apr 2019 02:07:19 +0000 (02:07 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 22 Apr 2019 02:07:19 +0000 (02:07 +0000)
commit7fcbda702e76b6390076c28832f5aea80086d15a
tree265bf6acf11ad7987850c8733ea1b36248cc8c24
parent6c0e07b8bdc85f757e2d1e6993e64f2e1540deb6
parent3cefdc62e0dda75985221853fb123572d6fc068b
Merge branch 'rework-emoji-management' into 'develop'

Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073
CHANGELOG.md
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex