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)
commita5e1c400e49e7979e70f2c9dd4887ae144dca44c
tree559fe96b7f65cd750a4bab5e9a117c43829c800f
parent34235bc02a88718b1d5a9d7fa2437784b91bb692
parenta6c14041c49df0dc850204723cfc1f242ded8aa2
Merge branch 'issue/1975' into 'develop'

[#1975] import emoji from a zip archive

Closes admin-fe#130

See merge request pleroma/pleroma!2911