diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-02 15:35:49 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-02 15:35:49 +0400 |
| commit | 4a45b96a91485a39f26bcc86b6cbd21d1547511e (patch) | |
| tree | b4a6cc3f7be26b84b85d3a1ff3adc9b896b54e85 /test/config | |
| parent | f446744a6a72d707504c2ba20ea2326f956b5097 (diff) | |
| parent | 45b08ca1665920564c9daf35a96e93dff031a649 (diff) | |
| download | pleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.tar.gz pleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.zip | |
Merge branch 'develop' into fix/signup-without-email
Diffstat (limited to 'test/config')
| -rw-r--r-- | test/config/config_db_test.exs | 2 | ||||
| -rw-r--r-- | test/config/holder_test.exs | 2 | ||||
| -rw-r--r-- | test/config/loader_test.exs | 2 | ||||
| -rw-r--r-- | test/config/transfer_task_test.exs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/config/config_db_test.exs b/test/config/config_db_test.exs index 812709fd8..ac3dde681 100644 --- a/test/config/config_db_test.exs +++ b/test/config/config_db_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.ConfigDBTest do diff --git a/test/config/holder_test.exs b/test/config/holder_test.exs index 0c1882d0f..2368d4856 100644 --- a/test/config/holder_test.exs +++ b/test/config/holder_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.Config.HolderTest do diff --git a/test/config/loader_test.exs b/test/config/loader_test.exs index 0dd4c60bb..4c93e5d4d 100644 --- a/test/config/loader_test.exs +++ b/test/config/loader_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.Config.LoaderTest do diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs index 3d7218dde..ce31d1e87 100644 --- a/test/config/transfer_task_test.exs +++ b/test/config/transfer_task_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.Config.TransferTaskTest do |