summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2022-12-15 17:17:49 -0500
committerLain Soykaf <lain@lain.com>2022-12-15 17:19:36 -0500
commit63d00f8123ddc5a8d9917e48216775f98ceac713 (patch)
treed65a76433291d1383f56bb8d55ce6eb29d69cfd6 /test/fixtures
parent2186e9b62b9c88812a616a7ad0d80f4b10a2deb1 (diff)
parent204fd6faae8c39706a5ded42c7cc4fbc71a733bc (diff)
downloadpleroma-63d00f8123ddc5a8d9917e48216775f98ceac713.tar.gz
pleroma-63d00f8123ddc5a8d9917e48216775f98ceac713.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-deps
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/config/temp.secret.exs2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/fixtures/config/temp.secret.exs b/test/fixtures/config/temp.secret.exs
index d4140d0c4..e5709ba6f 100644
--- a/test/fixtures/config/temp.secret.exs
+++ b/test/fixtures/config/temp.secret.exs
@@ -8,8 +8,6 @@ config :pleroma, :first_setting, key: "value", key2: [Pleroma.Repo]
config :pleroma, :second_setting, key: "value2", key2: ["Activity"]
-config :quack, level: :info
-
config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox
config :postgrex, :json_library, Poison