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

# Conflicts:
#	mix.exs

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc mix.exs
index 2b0d25b551ad00b0c30f438ac0defa1cec6a5aec,3a04e0060d96be00c5ff01734a0b2033d67d6252..30931821f13d09404fd07239bb8ce5da381a9b13
--- 1/mix.exs
--- 2/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.

diff --cc mix.lock
Simple merge