diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:25:18 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:25:18 -0500 |
| commit | 7d8f610720abdadeff9238aa8a345a91e473e0fa (patch) | |
| tree | c8fa941b0e0c0c7dd84888c4ae61e030f728b504 /test/fixtures | |
| parent | 5ec7d88b77360ed78f75be6b1f94895c3f602972 (diff) | |
| parent | 481906207e6d803e5c4d3e455c7b93119e392177 (diff) | |
| download | pleroma-7d8f610720abdadeff9238aa8a345a91e473e0fa.tar.gz pleroma-7d8f610720abdadeff9238aa8a345a91e473e0fa.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
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. """ |