diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-03 17:59:25 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-03 17:59:25 +0300 |
| commit | 55a94970d4452ae8ca97879edb0e8ec591fc1e99 (patch) | |
| tree | 77bc1ffb75605582bac23d5201e2cd12d36927e1 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
| parent | 89a64b21ee090db646c566c99269e980b8225c18 (diff) | |
| parent | 18b050dfd1fe053d28440c889feafb88dd6a9a73 (diff) | |
| download | pleroma-55a94970d4452ae8ca97879edb0e8ec591fc1e99.tar.gz | |
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex index 9f499e202..cc93fb509 100644 --- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex @@ -30,7 +30,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do alias Pleroma.Web.AdminAPI.Search alias Pleroma.Web.CommonAPI alias Pleroma.Web.Endpoint - alias Pleroma.Web.MastodonAPI alias Pleroma.Web.Router require Logger @@ -279,7 +278,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do }) conn - |> put_view(MastodonAPI.StatusView) + |> put_view(AdminAPI.StatusView) |> render("index.json", %{activities: activities, as: :activity}) else _ -> {:error, :not_found} |