libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 22:49:53 +01:00
Code Issues Projects Releases Wiki Activity
pad.libre-service.eu-etherpad/src/static/css
History
Egil Moeller ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
2012-03-02 22:00:20 +01:00
..
iframe_editor.css Merge branch 'pita' 2012-03-02 22:00:20 +01:00
pad.css Merge branch 'pita' 2012-03-02 22:00:20 +01:00
timeslider.css The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00