mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge branch 'feature/support-node-0.10' into develop

Browse source 
Conflicts:
	src/package.json
This commit is contained in:
Marcel Klehr 2013-04-01 13:29:07 +02:00
commit 04a53c4402
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/utils/Settings.js
View file

@ -142,7 +142,7 @@ exports.abiwordAvailable = function()
exports.reloadSettings = function reloadSettings() {
// Discover where the settings file lives
var settingsFilename = argv.settings || "settings.json";
settingsFilename = path.resolve(path.join(root, settingsFilename));
settingsFilename = path.resolve(path.join(exports.root, settingsFilename));
var settingsStr;
try{