Merge branch 'hotfix-the-hotfix' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 5 Sep 2020 19:04:19 +0000 (19:04 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 5 Sep 2020 19:04:19 +0000 (19:04 +0000)
commit047a60c46e11b68abfe710a895f4a9c134b951e8
tree7756a675fe07534b3ed32fd01e854e530600f2e0
parentb42869424f43af82d40b9095092556647f852a22
parent129a2f48df95ddd85fceee741a9991a6e092ed3d
Merge branch 'hotfix-the-hotfix' into 'develop'

ConnectionPool: fix the previous hotfix

See merge request pleroma/pleroma!2959