diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-06 11:48:30 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-06 11:48:30 +0300 |
commit | 027714b519cca63ac943369d0bcc9534ba448a80 (patch) | |
tree | ab331c60efe243bd6eb79c95b67dc797bb165078 /test/support | |
parent | 40765875d41f181b4ac54a772b4c61d6afc0bc34 (diff) | |
parent | 47604907c9d2379d0883d63bc7add5782cc25d63 (diff) | |
download | pleroma-027714b519cca63ac943369d0bcc9534ba448a80.tar.gz |
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
Diffstat (limited to 'test/support')
-rw-r--r-- | test/support/data_case.ex | 2 | ||||
-rw-r--r-- | test/support/mrf_module_mock.ex | 2 | ||||
-rw-r--r-- | test/support/web_push_http_client_mock.ex | 2 | ||||
-rw-r--r-- | test/support/websocket_client.ex | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/support/data_case.ex b/test/support/data_case.ex index 4ffcbac9e..1669f2520 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -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.DataCase do diff --git a/test/support/mrf_module_mock.ex b/test/support/mrf_module_mock.ex index 632c7ff1d..028ea542a 100644 --- a/test/support/mrf_module_mock.ex +++ b/test/support/mrf_module_mock.ex @@ -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 MRFModuleMock do diff --git a/test/support/web_push_http_client_mock.ex b/test/support/web_push_http_client_mock.ex index 1d6ccff7e..3cd12957d 100644 --- a/test/support/web_push_http_client_mock.ex +++ b/test/support/web_push_http_client_mock.ex @@ -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.WebPushHttpClientMock do diff --git a/test/support/websocket_client.ex b/test/support/websocket_client.ex index 121231452..8c9d4b2b4 100644 --- a/test/support/websocket_client.ex +++ b/test/support/websocket_client.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Integration.WebsocketClient do |