etherpad-lite/src/templates
François Boulogne d3ead86db1 Merge branch 'develop' of git://github.com/ether/etherpad-lite
Conflicts:
	src/templates/pad.html
	src/templates/timeslider.html
2012-11-15 20:52:24 +01:00
..
admin resolve #1131 make textarea resize 2012-11-06 11:56:19 +00:00
index.html Fix language auto-detection 2012-11-14 19:38:35 +01:00
pad.html Merge branch 'develop' of git://github.com/ether/etherpad-lite 2012-11-15 20:52:24 +01:00
timeslider.html Merge branch 'develop' of git://github.com/ether/etherpad-lite 2012-11-15 20:52:24 +01:00