From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Thu, 4 Apr 2019 20:43:08 +0000 (+0300)
Subject: [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=45765918c377c6daf8ee8e5bfad4ea24f67766b6;p=akkoma

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

# Conflicts:
#	mix.exs
---

45765918c377c6daf8ee8e5bfad4ea24f67766b6
diff --cc mix.exs
index 2b0d25b55,3a04e0060..30931821f
--- a/mix.exs
+++ b/mix.exs
@@@ -98,12 -91,12 +98,13 @@@ 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"},
-       {:pleroma_job_queue, "~> 0.2.0"}
+        ref: "479dd343f4e563ff91215c8275f3b5c67e032850"},
+       {:pleroma_job_queue, "~> 0.2.0"},
+       {:quack, "~> 0.1.1"}
 -    ]
 +    ] ++ oauth_deps
    end
  
    # Aliases are shortcuts or tasks specific to the current project.