summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-16 17:12:28 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-16 17:12:28 +0300
commit82914e1e4de37747653c83644b428c1ba29428c9 (patch)
tree0688c91826f16ba428a9cea7a25a74ed2ae19e1d /mix.exs
parent594dd01ab2864482d8c1cdb0153d7b4b0972b3b4 (diff)
parente158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff)
downloadpleroma-82914e1e4de37747653c83644b428c1ba29428c9.tar.gz
pleroma-82914e1e4de37747653c83644b428c1ba29428c9.zip
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/mix.exs b/mix.exs
index 43a93cc2c..09bc34f1a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -38,6 +38,8 @@ defmodule Pleroma.Mixfile do
{:trailing_format_plug, "~> 0.0.5" },
{:html_sanitize_ex, "~> 1.0.0"},
{:calendar, "~> 0.16.1"},
+ {:con_cache, "~> 0.12.0"},
+ {:ex_machina, "~> 2.0", only: :test},
{:mix_test_watch, "~> 0.2", only: :dev}]
end