Merge branch 'develop' into feature/digest-email
This commit is contained in:
commit
d2da3d30f3
40 changed files with 1195 additions and 319 deletions
2
mix.exs
2
mix.exs
|
|
@ -144,7 +144,7 @@ defmodule Pleroma.Mixfile do
|
|||
{:telemetry, "~> 0.3"},
|
||||
{:prometheus_ex, "~> 3.0"},
|
||||
{:prometheus_plugs, "~> 1.1"},
|
||||
{:prometheus_phoenix, "~> 1.2"},
|
||||
{:prometheus_phoenix, "~> 1.3"},
|
||||
{:prometheus_ecto, "~> 1.4"},
|
||||
{:recon, github: "ferd/recon", tag: "2.4.0"},
|
||||
{:quack, "~> 0.1.1"},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue