diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-14 09:02:55 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-14 09:02:55 -0500 |
| commit | 1a2fe96d56350dc685eb53112630af567de8d5bd (patch) | |
| tree | 31f5c24d81ab1a226776158d4bb1a62ef72c8834 /test/fixtures/config/temp.exported_from_db.secret.exs | |
| parent | 167e14416bec2846d3282a121cfcfd147a04a8bf (diff) | |
| parent | 173e977e283789a814278c63bc81f40a13942e21 (diff) | |
| download | pleroma-1a2fe96d56350dc685eb53112630af567de8d5bd.tar.gz pleroma-1a2fe96d56350dc685eb53112630af567de8d5bd.zip | |
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
Diffstat (limited to 'test/fixtures/config/temp.exported_from_db.secret.exs')
| -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..dda5d0fa6 --- /dev/null +++ b/test/fixtures/config/temp.exported_from_db.secret.exs @@ -0,0 +1,5 @@ +import Config + +config :pleroma, exported_config_merged: true + +config :pleroma, :first_setting, key: "new value" |