projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34235bc a6c1404)
Merge branch 'issue/1975' into 'develop'
authorlain <lain@soykaf.club>
Wed, 23 Sep 2020 10:49:29 +0000 (10:49 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Sep 2020 10:49:29 +0000 (10:49 +0000)
[#1975] import emoji from a zip archive

Closes admin-fe#130

See merge request pleroma/pleroma!2911


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git