summaryrefslogtreecommitdiff
path: root/test/web/admin_api
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-03-03 17:15:49 -0600
committerMark Felder <feld@FreeBSD.org>2020-03-03 17:15:49 -0600
commit4427161ca3798aeee0290f0ed7ac5536039509d8 (patch)
treeed45b8f7e551accff90eec1fb86d15fcecaea6b8 /test/web/admin_api
parent884d9710b209cc9981c7de61d4e95fd26cd83820 (diff)
parent5992c256ad7c5bc8207240c9d51e03964e50eb64 (diff)
downloadpleroma-4427161ca3798aeee0290f0ed7ac5536039509d8.tar.gz
pleroma-4427161ca3798aeee0290f0ed7ac5536039509d8.zip
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/admin_api')
-rw-r--r--test/web/admin_api/search_test.exs2
-rw-r--r--test/web/admin_api/views/report_view_test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/admin_api/search_test.exs b/test/web/admin_api/search_test.exs
index 082e691c4..e0e3d4153 100644
--- a/test/web/admin_api/search_test.exs
+++ b/test/web/admin_api/search_test.exs
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.SearchTest do
diff --git a/test/web/admin_api/views/report_view_test.exs b/test/web/admin_api/views/report_view_test.exs
index a0c6eab3c..5db6629f2 100644
--- a/test/web/admin_api/views/report_view_test.exs
+++ b/test/web/admin_api/views/report_view_test.exs
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ReportViewTest do