summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-23 10:37:29 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-23 10:37:29 +0200
commit4649ba2d627ab1c42e9067d0af783ae05ac8ae11 (patch)
tree4bc0c9062e597e2d85c005d93ef6dbacf098e84a /mix.exs
parent361a8c42197a92f044fc3d0ceadeee5e3590e96f (diff)
parentcef4a4d7095eae474c0bebaa4b0fb0001f140672 (diff)
downloadpleroma-4649ba2d627ab1c42e9067d0af783ae05ac8ae11.tar.gz
pleroma-4649ba2d627ab1c42e9067d0af783ae05ac8ae11.zip
Merge branch 'ostatus' into develop
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/mix.exs b/mix.exs
index f6831550b..0e54f0246 100644
--- a/mix.exs
+++ b/mix.exs
@@ -39,6 +39,7 @@ defmodule Pleroma.Mixfile do
{:html_sanitize_ex, "~> 1.0.0"},
{:calendar, "~> 0.16.1"},
{:cachex, "~> 2.1"},
+ {:httpoison, "~> 0.11.1"},
{:ex_machina, "~> 2.0", only: :test},
{:mix_test_watch, "~> 0.2", only: :dev}]
end