projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
marker_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
index 9f0481120df495e61ab4f4812b9ac50beb8c9e4f..ee944a67c36022dd7906cb3a0d9a54ff7010a8d2 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/marker_controller_test.exs
@@
-3,7
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
- use Pleroma.Web.ConnCase
+ use Pleroma.Web.ConnCase
, async: true
import Pleroma.Factory