etherpad-lite/src/templates
rugk f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
Conflicts:
	src/templates/index.html
2016-09-30 19:20:40 +02:00
..
admin Added LibreJS support 2016-09-20 09:30:35 +02:00
export_html.html Added LibreJS support 2016-09-20 09:30:35 +02:00
index.html Merge https://github.com/ether/etherpad-lite into patch-3 2016-09-30 19:20:40 +02:00
javascript.html Added LibreJS support 2016-09-20 09:30:35 +02:00
pad.html Merge https://github.com/ether/etherpad-lite into patch-3 2016-09-30 19:20:40 +02:00
timeslider.html Merge https://github.com/ether/etherpad-lite into patch-3 2016-09-30 19:20:40 +02:00