diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-03-03 17:15:49 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-03-03 17:15:49 -0600 |
| commit | 4427161ca3798aeee0290f0ed7ac5536039509d8 (patch) | |
| tree | ed45b8f7e551accff90eec1fb86d15fcecaea6b8 /test/web/instances | |
| parent | 884d9710b209cc9981c7de61d4e95fd26cd83820 (diff) | |
| parent | 5992c256ad7c5bc8207240c9d51e03964e50eb64 (diff) | |
| download | pleroma-4427161ca3798aeee0290f0ed7ac5536039509d8.tar.gz pleroma-4427161ca3798aeee0290f0ed7ac5536039509d8.zip | |
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/instances')
| -rw-r--r-- | test/web/instances/instance_test.exs | 2 | ||||
| -rw-r--r-- | test/web/instances/instances_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs index e54d708ad..a3c93b986 100644 --- a/test/web/instances/instance_test.exs +++ b/test/web/instances/instance_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.Instances.InstanceTest do diff --git a/test/web/instances/instances_test.exs b/test/web/instances/instances_test.exs index 65b03b155..c5d6abc9c 100644 --- a/test/web/instances/instances_test.exs +++ b/test/web/instances/instances_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.InstancesTest do |