From: lain <lain@soykaf.club>
Date: Wed, 23 Sep 2020 10:49:29 +0000 (+0000)
Subject: Merge branch 'issue/1975' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a5e1c400e49e7979e70f2c9dd4887ae144dca44c;p=akkoma

Merge branch 'issue/1975' into 'develop'

[#1975] import emoji from a zip archive

Closes admin-fe#130

See merge request pleroma/pleroma!2911
---

a5e1c400e49e7979e70f2c9dd4887ae144dca44c