projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'fix/2412-filters'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
status_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/status_controller.ex
b/lib/pleroma/web/admin_api/controllers/status_controller.ex
index cefdf5d40d0ad39834108dc740c9da4bfb8ed391..903badec0431aad5f5dc28bc645383a1a2413095 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/status_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/status_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusController do
@@
-7,10
+7,10
@@
defmodule Pleroma.Web.AdminAPI.StatusController do
alias Pleroma.Activity
alias Pleroma.ModerationLog
alias Pleroma.Activity
alias Pleroma.ModerationLog
- alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
require Logger
require Logger