diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-10 08:55:15 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-10 08:55:15 +0000 |
| commit | 4ac6e6283f6e090588ad56066b1e552b895f3a24 (patch) | |
| tree | c6536c1ab63ea26913b649cc3f64cea438b62f38 /mix.exs | |
| parent | c2be0da79fcc95399647b292e0b9a4119d3dcdf1 (diff) | |
| parent | 5ea638757210c34b40fb568e537082b78f4118a6 (diff) | |
| download | pleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.tar.gz pleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.zip | |
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -178,6 +178,7 @@ defmodule Pleroma.Mixfile do ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"}, {:telemetry, "~> 0.3"}, {:poolboy, "~> 1.5"}, + {:prometheus, "~> 4.6"}, {:prometheus_ex, "~> 3.0"}, {:prometheus_plugs, "~> 1.1"}, {:prometheus_phoenix, "~> 1.3"}, |