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 https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
test
/
pleroma
/
web
/
pleroma_api
/
controllers
/
conversation_controller_test.exs
diff --git
a/test/pleroma/web/pleroma_api/controllers/conversation_controller_test.exs
b/test/pleroma/web/pleroma_api/controllers/conversation_controller_test.exs
index f2feeaaef1f111220cdf4e21157ee653a08bcc54..98a23aaaadd9cecc332c920fb34b5888318f4105 100644
(file)
--- a/
test/pleroma/web/pleroma_api/controllers/conversation_controller_test.exs
+++ b/
test/pleroma/web/pleroma_api/controllers/conversation_controller_test.exs
@@
-1,9
+1,9
@@
# 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.PleromaAPI.ConversationControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.ConversationControllerTest do
- use Pleroma.Web.ConnCase
+ use Pleroma.Web.ConnCase
, async: true
alias Pleroma.Conversation.Participation
alias Pleroma.Repo
alias Pleroma.Conversation.Participation
alias Pleroma.Repo