diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-17 16:59:05 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-17 16:59:05 +0700 |
| commit | 2f0203a4a1c7a507aa5cf50be2fd372536ebfc81 (patch) | |
| tree | 8219ebfbfffb47ffff5649dfe428c501a4ccb089 /mix.exs | |
| parent | 87013f843853250e8b15696900e09afb92d22aac (diff) | |
| download | pleroma-2f0203a4a1c7a507aa5cf50be2fd372536ebfc81.tar.gz pleroma-2f0203a4a1c7a507aa5cf50be2fd372536ebfc81.zip | |
Resolve conflicts
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -8,7 +8,7 @@ defmodule Pleroma.Mixfile do elixir: "~> 1.7", elixirc_paths: elixirc_paths(Mix.env()), compilers: [:phoenix, :gettext] ++ Mix.compilers(), - elixirc_options: [warnings_as_errors: true], + # elixirc_options: [warnings_as_errors: true], xref: [exclude: [:eldap]], start_permanent: Mix.env() == :prod, aliases: aliases(), @@ -110,7 +110,8 @@ defmodule Pleroma.Mixfile do {:prometheus_ecto, "~> 1.4"}, {:prometheus_process_collector, "~> 1.4"}, {:recon, github: "ferd/recon", tag: "2.4.0"}, - {:quack, "~> 0.1.1"} + {:quack, "~> 0.1.1"}, + {:quantum, "~> 2.3"} ] ++ oauth_deps end |