summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-04 20:50:18 +0000
committerkaniini <nenolod@gmail.com>2019-01-04 20:50:18 +0000
commit4258dd8633407587ca1f3dfe275afa6a91be9197 (patch)
tree44dde15a2d2237297ce0a21f64bd3313836a3b7d /mix.exs
parentffea81b84f73c75853518f7e0c28b8429f752a36 (diff)
parent48e81d3d40d334bccb8438c61ab6b307ddb1392f (diff)
downloadpleroma-4258dd8633407587ca1f3dfe275afa6a91be9197.tar.gz
pleroma-4258dd8633407587ca1f3dfe275afa6a91be9197.zip
Merge branch 'feature/rich-media' into 'develop'
URL previews in posts Closes #402 See merge request pleroma/pleroma!617
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index efdd4b7ed..0b8052d0a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -75,7 +75,8 @@ defmodule Pleroma.Mixfile do
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.20"},
{:gen_smtp, "~> 0.13"},
- {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
+ {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
+ {:floki, "~> 0.20.0"}
]
end