Merge develop

This commit is contained in:
Roman Chvanikov 2019-07-20 01:03:25 +03:00
commit 36049f08ef
57 changed files with 1284 additions and 168 deletions

View file

@ -139,7 +139,7 @@ defmodule Pleroma.Mixfile do
ref: "95e8188490e97505c56636c1379ffdf036c1fdde"},
{:http_signatures,
git: "https://git.pleroma.social/pleroma/http_signatures.git",
ref: "9789401987096ead65646b52b5a2ca6bf52fc531"},
ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
{:pleroma_job_queue,
git: "https://git.pleroma.social/pleroma/pleroma_job_queue.git", ref: "0637ccb1"},
{:telemetry, "~> 0.3"},