Merge branch 'feld-hackneyupdate' into 'develop'

Update httpoison to get the latest hackney.

See merge request pleroma/pleroma!107

1 files changed, 1 insertions, 1 deletions

diff --git a/mix.exs b/mix.exs
index dfb8f6c22..f49d2d04a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -42,7 +42,7 @@ defmodule Pleroma.Mixfile do
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.16.1"},
       {:cachex, "~> 2.1"},
-      {:httpoison, "~> 0.11.2"},
+      {:httpoison, "~> 1.1.0"},
       {:jason, "~> 1.0"},
       {:ex_machina, "~> 2.0", only: :test},
       {:credo, "~> 0.7", only: [:dev, :test]},