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>
Tue, 8 Sep 2020 16:45:44 +0000 (19:45 +0300)
commit27c3973b78b432cef7feb9e2518bf143285c461d
treeb9db91d0a5056f451c890d0f65c551fb59a743f8
parent7490b76bbfa0e39f7950d5611f00bddb2aac34ad
Merge branch 'temp-hackney-fix' into 'develop'

temp hackney fix

See merge request pleroma/pleroma!2951
lib/pleroma/http/adapter_helper/hackney.ex
lib/pleroma/reverse_proxy/client/hackney.ex
mix.exs
mix.lock