Peter 'Pita' Martischka 913c3c455d fixed merge conflicts		2011-08-22 13:14:59 +01:00
..
css	fixed merge conflicts	2011-08-22 13:14:59 +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 'master' of /home/jose/etherpad-lite/	2011-08-20 18:23:58 +01:00
js	fixed merge conflicts	2011-08-22 13:14:59 +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	reverted js functions but reduced if clause using ternary operation	2011-08-17 21:58:07 +03:00
pad.html	fixed merge conflicts	2011-08-22 13:14:59 +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	remove star buttons on timeslider	2011-08-21 20:09:09 +01:00