Merge branch 'develop' of git://github.com/Pita/etherpad-lite into removeWordle
commit
dc8495765f
|
@ -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();
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue