[#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 lib/pleroma/web/oauth/oauth_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc mix.exs
index 205edf0b6df7121e67e48dc270f3e9cc97e70d67,333f21a914d71e24c5c30687aeb258e1324323ab..34c17bd6bb18d8f732fbbec4841d5f228d129c97
--- 1/mix.exs
--- 2/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.

diff --cc mix.lock
Simple merge