diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-30 21:00:40 +0100 |
| commit | dec23500d8988c22a99f049ef1d1e49328ba075a (patch) | |
| tree | a6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b /mix.exs | |
| parent | ab3089d6a718d4a70b0d702307d41e64e17bc505 (diff) | |
| parent | dfde2622d0c14195392e306fadc7c729c68da273 (diff) | |
| download | pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.tar.gz pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.zip | |
Resolve merge conflict
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5,7 +5,7 @@ defmodule Pleroma.Mixfile do [ app: :pleroma, version: version("0.9.0"), - elixir: "~> 1.4", + elixir: "~> 1.7", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), elixirc_options: [warnings_as_errors: true], @@ -71,7 +71,7 @@ defmodule Pleroma.Mixfile do {:crypt, git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, {:cors_plug, "~> 1.5"}, - {:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false}, + {:ex_doc, "~> 0.19", only: :dev, runtime: false}, {:web_push_encryption, "~> 0.2.1"}, {:swoosh, "~> 0.20"}, {:gen_smtp, "~> 0.13"}, |