summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-16 13:32:56 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-16 13:32:56 +0300
commit7a0046d1271d97d635294ee0cace135d32b141ba (patch)
tree0e5d18d2952e7299ddfa093ccf4eb523e8b72c11 /mix.exs
parent18cd04ade576969b25e96733dddb8255fbf13a6d (diff)
parentb179b3413e7dbdafbe8a3839ba7719b9eb2a582d (diff)
downloadpleroma-7a0046d1271d97d635294ee0cace135d32b141ba.tar.gz
pleroma-7a0046d1271d97d635294ee0cace135d32b141ba.zip
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
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