diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-14 15:27:15 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-14 15:27:15 -0500 |
| commit | 1fb9452131721456adf2c19c513e6343f64825a7 (patch) | |
| tree | 20c679c19e83925e0fcb0d34aba7eaf831485f58 /test/fixtures | |
| parent | bc3db724030707e9903d161a70b10fe217a83212 (diff) | |
| parent | 20137056900f97af34f4433858cbdf69be6c9840 (diff) | |
| download | pleroma-1fb9452131721456adf2c19c513e6343f64825a7.tar.gz pleroma-1fb9452131721456adf2c19c513e6343f64825a7.zip | |
Merge branch 'develop' into feature/account-export
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/config/temp.secret.exs | 4 | ||||
| -rw-r--r-- | test/fixtures/modules/runtime_module.ex | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/fixtures/config/temp.secret.exs b/test/fixtures/config/temp.secret.exs index fa8c7c7e8..621bc8cf6 100644 --- a/test/fixtures/config/temp.secret.exs +++ b/test/fixtures/config/temp.secret.exs @@ -1,3 +1,7 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + use Mix.Config config :pleroma, :first_setting, key: "value", key2: [Pleroma.Repo] diff --git a/test/fixtures/modules/runtime_module.ex b/test/fixtures/modules/runtime_module.ex index f11032b57..e348c499e 100644 --- a/test/fixtures/modules/runtime_module.ex +++ b/test/fixtures/modules/runtime_module.ex @@ -2,7 +2,7 @@ # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -defmodule RuntimeModule do +defmodule Fixtures.Modules.RuntimeModule do @moduledoc """ This is a dummy module to test custom runtime modules. """ |