diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:08:23 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:08:23 -0500 |
| commit | bf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2 (patch) | |
| tree | a893776f6d6c2fe3c81376891c186983481d7a0f /test/fixtures/config | |
| parent | fda34591cefad94277385311c6391d1ca2adb36c (diff) | |
| parent | 8e9f032f25251d910b59c55226d10a305bad3cba (diff) | |
| download | pleroma-bf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2.tar.gz pleroma-bf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
Diffstat (limited to 'test/fixtures/config')
| -rw-r--r-- | test/fixtures/config/temp.exported_from_db.secret.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/fixtures/config/temp.exported_from_db.secret.exs b/test/fixtures/config/temp.exported_from_db.secret.exs new file mode 100644 index 000000000..64bee7f32 --- /dev/null +++ b/test/fixtures/config/temp.exported_from_db.secret.exs @@ -0,0 +1,5 @@ +use Mix.Config + +config :pleroma, exported_config_merged: true + +config :pleroma, :first_setting, key: "new value" |