projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1364] Resolved merge conflicts with `develop`.
[akkoma]
/
test
/
federation
/
federation_test.exs
diff --git
a/test/federation/federation_test.exs
b/test/federation/federation_test.exs
index 45800568ad6fc43ab2beb7d992bdbe7ec0980a16..10d71fb886ea720fcb90ec1077882ec1825bc8a4 100644
(file)
--- a/
test/federation/federation_test.exs
+++ b/
test/federation/federation_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
18
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Integration.FederationTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Integration.FederationTest do