projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into gun
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index b28c65694cf378752b9368f5f5721ffdfaf48d21..273307bbe99e20ace12dc160d9abd95f8422bd58 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-120,6
+120,10
@@
defmodule Pleroma.Mixfile do
{:cachex, "~> 3.0.2"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.3", override: true},
{:cachex, "~> 3.0.2"},
{:poison, "~> 3.0", override: true},
{:tesla, "~> 1.3", override: true},
+ {:castore, "~> 0.1"},
+ {:cowlib, "~> 2.8", override: true},
+ {:gun,
+ github: "ninenines/gun", ref: "bd6425ab87428cf4c95f4d23e0a48fd065fbd714", override: true},
{:jason, "~> 1.0"},
{:mogrify, "~> 0.6.1"},
{:ex_aws, "~> 2.1"},
{:jason, "~> 1.0"},
{:mogrify, "~> 0.6.1"},
{:ex_aws, "~> 2.1"},
@@
-139,8
+143,8
@@
defmodule Pleroma.Mixfile do
{:phoenix_swoosh, "~> 0.2"},
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
{:phoenix_swoosh, "~> 0.2"},
{:gen_smtp, "~> 0.13"},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
- {:floki, "~> 0.23.0"},
{:ex_syslogger, "~> 1.4"},
{:ex_syslogger, "~> 1.4"},
+ {:floki, "~> 0.25"},
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
{:auto_linker,
{:timex, "~> 3.5"},
{:ueberauth, "~> 0.4"},
{:auto_linker,