Merge branch 'temp-hackney-fix' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 7 Sep 2020 12:47:43 +0000 (12:47 +0000)
temp hackney fix

See merge request pleroma/pleroma!2951

1  2 
CHANGELOG.md
mix.exs
mix.lock

diff --cc CHANGELOG.md
Simple merge
diff --cc mix.exs
Simple merge
diff --cc mix.lock
Simple merge