summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2018-03-13 13:36:23 +0000
committerGeorge Goldberg <george@gberg.me>2018-03-13 13:36:23 +0000
commitfadcdd271a68b38571b75d1d38ab023f940ac83a (patch)
tree7f413edd35401b54b2f4eb4a687da1ac273bcd4b /config
parentb66e4bc932ed76c1cfd2b5f4ec0cfce70cd9fbb4 (diff)
parentf2d26801b9647715fb43af873354d8def753868b (diff)
downloadchat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.gz
chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.tar.bz2
chat-fadcdd271a68b38571b75d1d38ab023f940ac83a.zip
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'config')
-rw-r--r--config/default.json8
1 files changed, 7 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json
index 82b5fc57d..b05ff11e7 100644
--- a/config/default.json
+++ b/config/default.json
@@ -358,7 +358,13 @@
"DailyRunTime": "01:00",
"ExportFromTimestamp": 0,
"FileLocation": "export",
- "BatchSize": 10000
+ "BatchSize": 10000,
+ "GlobalRelaySettings": {
+ "CustomerType": "A9",
+ "SmtpUsername": "",
+ "SmtpPassword": "",
+ "EmailAddress": ""
+ }
},
"JobSettings": {
"RunJobs": true,