diff options
| author | lain <lain@soykaf.club> | 2020-10-23 13:25:41 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-23 13:25:41 +0200 |
| commit | 682f0aa2597bec4ef80691daddae1d87ddeeae0a (patch) | |
| tree | c8ae5efb603e6b226ed3b5d39efb3912b63d17b9 /lib/pleroma/web/mastodon_api/controllers/app_controller.ex | |
| parent | 346a59aee68d71af5d7ab6cfb9ff89008a032f2b (diff) | |
| parent | 096e4518adf176c3f9cee0e38319340249083a48 (diff) | |
| download | pleroma-682f0aa2597bec4ef80691daddae1d87ddeeae0a.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2061-chat-deletion
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/app_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/app_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex index a516b6c20..143dcf80c 100644 --- a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex @@ -5,12 +5,12 @@ defmodule Pleroma.Web.MastodonAPI.AppController do use Pleroma.Web, :controller - alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug - alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.Repo alias Pleroma.Web.OAuth.App alias Pleroma.Web.OAuth.Scopes alias Pleroma.Web.OAuth.Token + alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug + alias Pleroma.Web.Plugs.OAuthScopesPlug action_fallback(Pleroma.Web.MastodonAPI.FallbackController) |