From: lambda <pleromagit@rogerbraun.net>
Date: Wed, 11 Apr 2018 14:27:52 +0000 (+0000)
Subject: Merge branch 'feld-hackneyupdate' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=faa0feb0956359c5fe7e68e56556bb621f6d08f5;p=akkoma

Merge branch 'feld-hackneyupdate' into 'develop'

Update httpoison to get the latest hackney.

See merge request pleroma/pleroma!107
---

faa0feb0956359c5fe7e68e56556bb621f6d08f5