Merge branch 'develop' of git://github.com/Pita/etherpad-lite into removeWordle

pull/705/head
John McLear 2012-05-13 20:15:39 +01:00
commit dc8495765f
1 changed files with 1 additions and 1 deletions

View File

@ -431,7 +431,7 @@ exports.setPassword = function(padID, password, callback)
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
//set the password //set the password
pad.setPassword(password); pad.setPassword(password == "" ? null : password);
callback(); callback();
}); });