projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
web
/
pleroma_api
/
controllers
/
chat_controller_test.exs
diff --git
a/test/web/pleroma_api/controllers/chat_controller_test.exs
b/test/web/pleroma_api/controllers/chat_controller_test.exs
index 72a9a91ff3d50a2f5c1ff93337bc71f5c3cde655..b4b73da90ec010d2f7955dc8ce5c0bb3d52d1e08 100644
(file)
--- a/
test/web/pleroma_api/controllers/chat_controller_test.exs
+++ b/
test/web/pleroma_api/controllers/chat_controller_test.exs
@@
-5,8
+5,8
@@
defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
use Pleroma.Web.ConnCase, async: true
alias Pleroma.Chat
- alias Pleroma.Web.CommonAPI
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.CommonAPI
import Pleroma.Factory