diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
| commit | e8493431bfc16977e43715bf8bdb09ac46580028 (patch) | |
| tree | 2e1a0068583ca62870a15590c4ccba237999f51a /priv/templates | |
| parent | 42f76306e7fe69fc51be00285a4fef8569f54989 (diff) | |
| parent | e7c49d51d724680c1f19888ea409687733753c7b (diff) | |
| download | pleroma-e8493431bfc16977e43715bf8bdb09ac46580028.tar.gz pleroma-e8493431bfc16977e43715bf8bdb09ac46580028.zip | |
Merge branch 'release/2.0.0' into 'stable'
Release/2.0.0
See merge request pleroma/pleroma!2273
Diffstat (limited to 'priv/templates')
| -rw-r--r-- | priv/templates/sample_config.eex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index 4dbf552ce..bc7e37375 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -69,3 +69,5 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" # host: "s3.wasabisys.com" config :joken, default_signer: "<%= jwt_secret %>" + +config :pleroma, configurable_from_database: <%= db_configurable? %> |