aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-01-20 18:10:55 +0100
committerlain <lain@soykaf.club>2020-01-20 18:10:55 +0100
commit7d8b709d293064462256d9a6392f993232323a4d (patch)
tree9565cc8b0eae80ed40cae526a124a3cfa9e2edec /lib/pleroma/web/oauth/oauth_controller.ex
parent4c5b5f14dcec51cba8e86bcfcf2943ee9b49b0e4 (diff)
parentab36459464311389c2929ff1c48537889066a9f8 (diff)
downloadpleroma-7d8b709d293064462256d9a6392f993232323a4d.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index d31a3d91c..5292aedf2 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -14,10 +14,10 @@ defmodule Pleroma.Web.OAuth.OAuthController do
alias Pleroma.Web.ControllerHelper
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.Web.OAuth.Scopes
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.OAuth.Token.Strategy.RefreshToken
alias Pleroma.Web.OAuth.Token.Strategy.Revoke, as: RevokeToken
- alias Pleroma.Web.OAuth.Scopes
require Logger