mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-17 19:54:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into timeslider-realtimeupdate+readonly-pads

Browse source 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
This commit is contained in:
Egil Moeller 2012-05-29 21:26:12 +02:00
commit 15a7d24450
32 changed files with 375 additions and 1962 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/db/API.js
View file

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