moved to settings.json.template bottom; chg gitignore

pull/1244/head
Wikinaut 2012-12-10 23:46:54 +01:00
parent 05e8c74307
commit e1a1540011
2 changed files with 5 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
node_modules
settings.json
!settings.json.template
APIKEY.txt
bin/abiword.exe
bin/node.exe

View File

@ -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']
}