merge: updates from upstream
All checks were successful
continuous-integration/drone/pr Build is passing
All checks were successful
continuous-integration/drone/pr Build is passing
Conflicts: mix.exs mix.lock
This commit is contained in:
12
mix.exs
12
mix.exs
@@ -37,9 +37,9 @@ defmodule Wabanex.MixProject do
|
||||
{:crudry, "~> 2.4.0"},
|
||||
{:decimal, "~> 2.1.0"},
|
||||
{:dialyxir, "~> 1.4.0", only: [:dev, :test], runtime: false},
|
||||
{:ecto_sql, "~> 3.11.0"},
|
||||
{:ecto_sql, "~> 3.12.0"},
|
||||
{:ex_doc, "~> 0.34.0", only: :dev, runtime: false},
|
||||
{:gettext, "~> 0.24.0"},
|
||||
{:gettext, "~> 0.25.0"},
|
||||
{:jason, "~> 1.4.0"},
|
||||
{:junit_formatter, "~> 3.4.0", only: [:test]},
|
||||
{:lcov_ex, "~> 0.3.0", only: [:dev, :test], runtime: false},
|
||||
@@ -48,14 +48,14 @@ defmodule Wabanex.MixProject do
|
||||
{:pg_ranges, "~> 1.1.0"},
|
||||
{:phoenix, "~> 1.7.0"},
|
||||
{:phoenix_ecto, "~> 4.6.0"},
|
||||
{:phoenix_view, "~> 2.0.0"},
|
||||
{:phoenix_live_dashboard, "~> 0.8.0"},
|
||||
{:phoenix_view, "~> 2.0.0"},
|
||||
{:plug_cowboy, "~> 2.7.0"},
|
||||
{:postgrex, "~> 0.18.0"},
|
||||
{:prom_ex, "~> 1.9.0"},
|
||||
{:postgrex, "~> 0.19.0"},
|
||||
{:prom_ex, "~> 1.10.0"},
|
||||
{:req, "~> 0.5.0"},
|
||||
{:sobelow, "~> 0.13", only: [:dev, :test], runtime: false},
|
||||
{:telemetry_metrics, "~> 0.6.0"},
|
||||
{:telemetry_metrics, "~> 1.0.0"},
|
||||
{:telemetry_poller, "~> 1.1.0"},
|
||||
{:xlsx_reader, "~> 0.8.0"}
|
||||
]
|
||||
|
Reference in New Issue
Block a user