From: Roman Chvanikov <chvanikoff@pm.me>
Date: Fri, 19 Jul 2019 22:03:25 +0000 (+0300)
Subject: Merge develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=36049f08efadb5f6f727753ecc1f7be6a5b4e3d8;p=akkoma

Merge develop
---

36049f08efadb5f6f727753ecc1f7be6a5b4e3d8
diff --cc mix.exs
index 25332deb9,c12b0a500..0eb92bb12
--- a/mix.exs
+++ b/mix.exs
@@@ -139,9 -138,8 +139,9 @@@ defmodule Pleroma.Mixfile d
         ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
        {:http_signatures,
         git: "https://git.pleroma.social/pleroma/http_signatures.git",
-        ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
+        ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
 -      {:pleroma_job_queue, "~> 0.2.0"},
 +      {:pleroma_job_queue,
 +       git: "https://git.pleroma.social/pleroma/pleroma_job_queue.git", ref: "0637ccb1"},
        {:telemetry, "~> 0.3"},
        {:prometheus_ex, "~> 3.0"},
        {:prometheus_plugs, "~> 1.1"},