From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Mon, 1 Apr 2019 05:49:32 +0000 (+0300)
Subject: [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=baffdcc480cea13269ef0e3af58f0a848892bb9a;p=akkoma

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
#	mix.exs
---

baffdcc480cea13269ef0e3af58f0a848892bb9a
diff --cc mix.exs
index 205edf0b6,333f21a91..34c17bd6b
--- a/mix.exs
+++ b/mix.exs
@@@ -102,11 -91,11 +98,12 @@@ defmodule Pleroma.Mixfile d
        {:floki, "~> 0.20.0"},
        {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
        {:timex, "~> 3.5"},
 +      {:ueberauth, "~> 0.4"},
        {:auto_linker,
         git: "https://git.pleroma.social/pleroma/auto_linker.git",
-        ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}
+        ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"},
+       {:pleroma_job_queue, "~> 0.2.0"}
 -    ]
 +    ] ++ oauth_deps
    end
  
    # Aliases are shortcuts or tasks specific to the current project.