summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-26 23:32:26 +0000
committerkaniini <nenolod@gmail.com>2019-02-26 23:32:26 +0000
commit1c265b3b19bacd2e0a9ccfee0f7e53a59d83a621 (patch)
tree00170ceac7432de10e7fb7d6a5b6b4e3a0147281 /mix.exs
parente9703a53265d38302d5659752c8068b5ef4a021f (diff)
parentc3ac9424d2affe87df82c14dc243f507fa639343 (diff)
downloadpleroma-1c265b3b19bacd2e0a9ccfee0f7e53a59d83a621.tar.gz
pleroma-1c265b3b19bacd2e0a9ccfee0f7e53a59d83a621.zip
Merge branch 'auto_linker' into 'develop'
AutoLinker Closes #609 See merge request pleroma/pleroma!839
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index d78825769..5392d94d1 100644
--- a/mix.exs
+++ b/mix.exs
@@ -90,7 +90,10 @@ defmodule Pleroma.Mixfile do
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
{:floki, "~> 0.20.0"},
{:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
- {:timex, "~> 3.5"}
+ {:timex, "~> 3.5"},
+ {:auto_linker,
+ git: "https://git.pleroma.social/pleroma/auto_linker.git",
+ ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}
]
end