Merge branch 'fix/hackney-follow-redirects' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sun, 13 Dec 2020 12:16:41 +0000 (12:16 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 13 Dec 2020 12:16:41 +0000 (12:16 +0000)
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix

Closes #2342

See merge request pleroma/pleroma!3199

1  2 
mix.exs
mix.lock

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