projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
fixtures
/
config
/
temp.secret.exs
diff --git
a/test/fixtures/config/temp.secret.exs
b/test/fixtures/config/temp.secret.exs
index f4686c101964ab4a18e4d830608cc0f1190ec9d8..dc950ca30833f65df60167482980bb08478391ad 100644
(file)
--- a/
test/fixtures/config/temp.secret.exs
+++ b/
test/fixtures/config/temp.secret.exs
@@
-7,3
+7,5
@@
config :pleroma, :second_setting, key: "value2", key2: ["Activity"]
config :quack, level: :info
config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox
config :quack, level: :info
config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox
+
+config :postgrex, :json_library, Poison