From: link0ff <juri@linkov.net>
Date: Thu, 14 Mar 2019 15:43:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=54e7087ab412a488f8ad7286aef89d313e5e7b14;p=akkoma

Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
---

54e7087ab412a488f8ad7286aef89d313e5e7b14
diff --cc lib/pleroma/web/oauth/oauth_controller.ex
index 7d5a5b9c5,ec70b7ccc..d69383d40
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@@ -5,12 -5,13 +5,12 @@@
  defmodule Pleroma.Web.OAuth.OAuthController do
    use Pleroma.Web, :controller
  
 -  alias Comeonin.Pbkdf2
+   alias Pleroma.Repo
+   alias Pleroma.User
    alias Pleroma.Web.Auth.Authenticator
+   alias Pleroma.Web.OAuth.App
    alias Pleroma.Web.OAuth.Authorization
    alias Pleroma.Web.OAuth.Token
-   alias Pleroma.Web.OAuth.App
-   alias Pleroma.Repo
-   alias Pleroma.User
  
    import Pleroma.Web.ControllerHelper, only: [oauth_scopes: 2]