Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth

This commit is contained in:
Peter 'Pita' Martischka 2011-12-04 17:22:00 +01:00
commit a4eef2780e
3 changed files with 31 additions and 0 deletions

View file

@ -68,6 +68,11 @@ exports.abiword = null;
*/
exports.loglevel = "INFO";
/**
* Http basic auth, with "user:password" format
*/
exports.httpAuth = null;
//read the settings sync
var settingsStr = fs.readFileSync("../settings.json").toString();