Edy cf54c23228 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block ... Resolved conflicts: src/templates/pad.html		2012-04-30 15:17:23 +02:00
..
node	Removed debug print	2012-04-20 15:08:50 +02:00
static	100% is not needed here http://ragefac.es/416	2012-04-29 21:19:34 +03:00
templates	Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block	2012-04-30 15:17:23 +02:00
ep.json	Searching for plugins, plus handling async events from the server (progress)	2012-03-15 21:07:48 +01:00
package.json	Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing)	2012-04-21 01:23:13 +02:00