diff options
author | Wikinaut <mail@tgries.de> | 2012-12-10 23:46:54 +0100 |
---|---|---|
committer | Wikinaut <mail@tgries.de> | 2012-12-10 23:46:54 +0100 |
commit | e1a15400119c4ce6376f3a43eb8d962c49509698 (patch) | |
tree | ed63713c359d1beafe7b21f6c3dc65539a25b3cc /settings.json.template | |
parent | 05e8c74307dcef8471e2d2e55ea8b98d49829dbb (diff) | |
download | etherpad-lite-e1a15400119c4ce6376f3a43eb8d962c49509698.zip |
moved to settings.json.template bottom; chg gitignore
Diffstat (limited to 'settings.json.template')
-rw-r--r-- | settings.json.template | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings.json.template b/settings.json.template index 897533f5..e37bc450 100644 --- a/settings.json.template +++ b/settings.json.template @@ -29,9 +29,6 @@ */ - // restricts socket.io transport methods - "socketTransportProtocols" : ['xhr-polling', 'jsonp-polling', 'htmlfile'], - //The Type of the database. You can choose between dirty, postgres, sqlite and mysql //You shouldn't use "dirty" for for anything else than testing or development "dbType" : "dirty", @@ -94,5 +91,8 @@ */ /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */ - "loglevel": "INFO" + "loglevel": "INFO", + + // restrict socket.io transport methods + "socketTransportProtocols" : ['xhr-polling', 'jsonp-polling', 'htmlfile'] } |