3 commits

Author	SHA1	Message	Date
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
Egil Moeller	763361a7c9	First stab at getting client side require(plugin/..) to work from within etherpad	2012-02-26 17:48:17 +01:00
Egil Moeller	1239ce7f28	The Big Renaming - etherpad is now an NPM module	2012-02-26 13:07:51 +01:00

Renamed from static/js/collab_client.js (Browse further)