projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c0e07b 3cefdc6)
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)
Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git