diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-24 02:42:28 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-24 02:42:28 +0300 |
| commit | f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1 (patch) | |
| tree | 7542dbbe178183e4dd3c3451aa7744f18117fa37 /mix.exs | |
| parent | 03471151d6089e318abaf5265d42ffedf7a5b902 (diff) | |
| parent | 1a751529fb2cd3929e3373a908bec5db5cc32f1b (diff) | |
| download | pleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.tar.gz pleroma-f46805bb40bf29cd67acb33b6b65ed1e4e28d3e1.zip | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -138,12 +138,12 @@ defmodule Pleroma.Mixfile do ref: "95e8188490e97505c56636c1379ffdf036c1fdde"}, {:http_signatures, git: "https://git.pleroma.social/pleroma/http_signatures.git", - ref: "a2a5982fa167fb1352fbd518ce6b606ba233a989"}, + ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"}, {:pleroma_job_queue, "~> 0.2.0"}, {: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"}, |