Merge branch 'develop' into gun

This commit is contained in:
Alexander Strizhakov 2020-02-29 11:34:50 +03:00
commit 814b275af7
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
208 changed files with 1946 additions and 2688 deletions

View file

@ -185,11 +185,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do
tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}")
{:ok, _} =
:zip.unzip(
binary_archive,
cwd: tmp_pack_dir
)
{:ok, _} = :zip.unzip(binary_archive, cwd: String.to_charlist(tmp_pack_dir))
emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts)