diff options
author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-03 10:08:07 +0300 |
---|---|---|
committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-03 10:08:07 +0300 |
commit | 509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21 (patch) | |
tree | 6939fe33f705c384bdf2bc05a348be02b64ec3fc /test/config | |
parent | f987d83885eef7cd8d114feefe8870a8c5e841c6 (diff) | |
parent | 4c02e049358441529c54a72cd11f1c81ee897d49 (diff) | |
download | pleroma-509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21.tar.gz |
Merge branch 'develop' into gun
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 394040a59..6b0e7b4b6 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 |