diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-04 13:23:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-04 13:23:01 +0000 |
| commit | a553ed542774891b6b0b7a57372a2c0300bbe2ba (patch) | |
| tree | e67eab56a7cac2b2088df44a83e901d9b8d8c10c /priv | |
| parent | 70d18a278c76e5681543a21150884f9e5dfcd097 (diff) | |
| parent | 1e6aa101688e157c9df7ff39aad9acf2fb44fec6 (diff) | |
| download | pleroma-a553ed542774891b6b0b7a57372a2c0300bbe2ba.tar.gz pleroma-a553ed542774891b6b0b7a57372a2c0300bbe2ba.zip | |
Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'
Remove in-db configuration references from 1.1
See merge request pleroma/pleroma!1781
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/sample_config.eex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index dc75d4008..4dbf552ce 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -20,8 +20,7 @@ config :pleroma, :instance, email: "<%= email %>", notify_email: "<%= notify_email %>", limit: 5000, - registrations_open: true, - dynamic_configuration: <%= db_configurable? %> + registrations_open: true config :pleroma, :media_proxy, enabled: false, |