diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-14 18:15:56 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-14 18:15:56 +0700 |
| commit | 5e2b491276d5cd8d90fddf219f7653d1c9b31ef3 (patch) | |
| tree | c7d10c01a9b17ba9c732cb43e2097bd26d67e915 /mix.exs | |
| parent | 1557b99beb3b406572ef2d3baaabed1c9baeca1c (diff) | |
| parent | cdcdbd88da76f18c21da7f6f15a29883044902c8 (diff) | |
| download | pleroma-5e2b491276d5cd8d90fddf219f7653d1c9b31ef3.tar.gz pleroma-5e2b491276d5cd8d90fddf219f7653d1c9b31ef3.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -87,7 +87,7 @@ defmodule Pleroma.Mixfile do {:bbcode, "~> 0.1"}, {:ex_machina, "~> 2.3", only: :test}, {:credo, "~> 0.9.3", only: [:dev, :test]}, - {:mock, "~> 0.3.1", only: :test}, + {:mock, "~> 0.3.3", only: :test}, {:crypt, git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, {:cors_plug, "~> 1.5"}, @@ -113,7 +113,9 @@ defmodule Pleroma.Mixfile do {:recon, github: "ferd/recon", tag: "2.4.0"}, {:quack, "~> 0.1.1"}, {:benchee, "~> 1.0"}, - {:esshd, "~> 0.1.0"} + {:esshd, "~> 0.1.0"}, + {:ex_rated, "~> 1.2"}, + {:plug_static_index_html, "~> 1.0.0"} ] ++ oauth_deps end |
