libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
etherpad-lite/src/node/db
History
Egil Moeller ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
2012-03-02 22:00:20 +01:00
..
API.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
AuthorManager.js Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
DB.js The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
GroupManager.js Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
Pad.js Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
PadManager.js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
ReadOnlyManager.js Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
SecurityManager.js Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
SessionManager.js Removed CommonCode entierly 2012-02-28 21:19:10 +01:00