diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-02 18:41:12 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-03-02 18:41:12 +0300 |
| commit | 99a6c660a909d8c74289015b3f69357196256112 (patch) | |
| tree | 9225c2fa6d49b6d487e188d58f5da04387c66bf4 /test/web/common_api | |
| parent | 0cf1d4fcd0c15594f663101061670a4555132840 (diff) | |
| parent | 45b08ca1665920564c9daf35a96e93dff031a649 (diff) | |
| download | pleroma-99a6c660a909d8c74289015b3f69357196256112.tar.gz pleroma-99a6c660a909d8c74289015b3f69357196256112.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
Diffstat (limited to 'test/web/common_api')
| -rw-r--r-- | test/web/common_api/common_api_test.exs | 2 | ||||
| -rw-r--r-- | test/web/common_api/common_api_utils_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 601c32954..299d968db 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_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.CommonAPITest do diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs index 848300ef3..b380d10d8 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_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.CommonAPI.UtilsTest do |