diff options
| author | Ilja <domainepublic@spectraltheorem.be> | 2020-10-23 11:11:51 +0200 |
|---|---|---|
| committer | Ilja <domainepublic@spectraltheorem.be> | 2020-10-23 11:11:51 +0200 |
| commit | 3ca8feb24648dcee766cef958e84f758b0acec64 (patch) | |
| tree | a1b59cae266fa808aadbdf234146ede4aaa06b58 /lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | |
| parent | 513103829641faca5501d1d3123ce3c077d7da25 (diff) | |
| parent | 096e4518adf176c3f9cee0e38319340249083a48 (diff) | |
| download | pleroma-3ca8feb24648dcee766cef958e84f758b0acec64.tar.gz | |
fix merge conflict
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/instance_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/instance_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex index d8859731d..07a32491a 100644 --- a/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/instance_controller.ex @@ -9,7 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceController do plug( :skip_plug, - [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug] + [Pleroma.Web.Plugs.OAuthScopesPlug, Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug] when action in [:show, :peers] ) |