Merge branch 'feld-hackneyupdate' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 11 Apr 2018 14:27:52 +0000 (14:27 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 11 Apr 2018 14:27:52 +0000 (14:27 +0000)
commitfaa0feb0956359c5fe7e68e56556bb621f6d08f5
tree9e6477e107a1aca415c563ffd3079dbe8eb4c4de
parentb910483c16e231f107d0c4e8c76f60a6a1bd1a79
parent366138fa72303cfb7db7db6e57554a48534db451
Merge branch 'feld-hackneyupdate' into 'develop'

Update httpoison to get the latest hackney.

See merge request pleroma/pleroma!107