diff options
| author | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-26 16:00:59 +0200 |
| commit | 4b3ec5351466f8615b32e62cc4e6215f8a80b105 (patch) | |
| tree | e46842eac5d8255858a113f71bdf42bfd75e4436 /mix.exs | |
| parent | 4fd9df100f61dfe4731934eca86500472d866f60 (diff) | |
| parent | 6138b297836f459e4fe5d21dfed30ddd9397b6d4 (diff) | |
| download | pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.tar.gz pleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.zip | |
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -36,12 +36,13 @@ defmodule Pleroma.Mixfile do {:postgrex, ">= 0.0.0"}, {:gettext, "~> 0.11"}, {:cowboy, "~> 1.0", override: true}, - {:comeonin, "~> 3.0"}, + {:comeonin, "~> 4.0"}, + {:pbkdf2_elixir, "~> 0.12"}, {:trailing_format_plug, "~> 0.0.5"}, {:html_sanitize_ex, "~> 1.3.0-rc1"}, {:phoenix_html, "~> 2.10"}, {:calendar, "~> 0.16.1"}, - {:cachex, "~> 2.1"}, + {:cachex, "~> 3.0"}, {:httpoison, "~> 1.1.0"}, {:jason, "~> 1.0"}, {:ex_machina, "~> 2.0", only: :test}, |