projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'features/validators-apc2s' into 'develop'
[akkoma]
/
test
/
fixtures
/
config
/
temp.exported_from_db.secret.exs
diff --git
a/test/fixtures/config/temp.exported_from_db.secret.exs
b/test/fixtures/config/temp.exported_from_db.secret.exs
index 64bee7f32d7c7fc9e8f540c3fc6cda83abdbf49e..dda5d0fa6207f4fdfa90aa985c542438ae854a6d 100644
(file)
--- a/
test/fixtures/config/temp.exported_from_db.secret.exs
+++ b/
test/fixtures/config/temp.exported_from_db.secret.exs
@@
-1,4
+1,4
@@
-
use Mix.
Config
+
import
Config
config :pleroma, exported_config_merged: true