mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 16:05:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
etherpad-lite/src/static
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
..
css Merge branch 'pita' 2012-03-02 22:00:20 +01:00
custom The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
img The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
js Merge branch 'pita' 2012-03-02 22:00:20 +01:00
favicon.ico Merge branch 'pita' 2012-03-02 22:00:20 +01:00
index.html Merge branch 'pita' 2012-03-02 22:00:20 +01:00
pad.html Merge branch 'pita' 2012-03-02 22:00:20 +01:00
robots.txt The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
tests.html The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00
timeslider.html Merge branch 'pita' 2012-03-02 22:00:20 +01:00