John McLear d20dcc7c57 fixed merge conflicts		2011-12-11 18:45:41 +01:00
..
css	fixed merge conflicts	2011-12-11 18:45:41 +01:00
custom	Changed the gitignore so everything exept the template files are ignored	2011-07-31 19:39:14 +01:00
img	Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki	2011-12-11 18:09:51 +01:00
js	fixed merge conflicts	2011-12-11 18:45:41 +01:00
favicon.ico	added a ugly favicon, to motivate people creating a better one ;)	2011-08-11 15:16:26 +01:00
index.html	Optimized index page for mobile devices	2011-12-06 18:48:28 +01:00
pad.html	Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki	2011-12-11 18:09:51 +01:00
robots.txt	Added a robots.txt	2011-05-19 17:55:47 +01:00
tests.html	added deleteGroup API function	2011-08-22 13:11:34 +01:00
timeslider.html	Fixed #135, thx to @Wikinaut	2011-11-28 11:26:36 -08:00