diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-02-19 16:58:28 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-02-19 16:58:28 +0000 |
| commit | 2d21ea1a0e1be2e737dc4d283e72207580856214 (patch) | |
| tree | f377cf25c36de97d664f13cebacb6ff2e0d43b91 /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 10a11f083ca543022c61e24b1ec0cc83811d6d06 (diff) | |
| parent | 1dd718e83c76db218f12a98344b568fe10ecbefe (diff) | |
| download | pleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.tar.gz pleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.zip | |
Merge branch 'develop' into fix/twittercards
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 42450a7b6..a27c26f95 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -5,7 +5,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do use Pleroma.Web.ConnCase - alias Pleroma.{Repo, User} + alias Pleroma.Repo + alias Pleroma.User import Pleroma.Factory describe "/api/pleroma/admin/user" do |