aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-21 09:23:35 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-21 09:23:35 +0300
commit41e233200730dca4a0d6d846d44653eef4de0fec (patch)
tree2920b8740145114b034fcdc860b2bc1b89f406dc /lib/pleroma/web/oauth/oauth_controller.ex
parenta5db044e579ed9923e610cdf89dff6146d9b0986 (diff)
parentab36459464311389c2929ff1c48537889066a9f8 (diff)
downloadpleroma-41e233200730dca4a0d6d846d44653eef4de0fec.tar.gz
Merge branch 'develop' into feature/tag_feed
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