mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-01 12:49:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 75

Merge branch 'pita'

Browse source 
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
This commit is contained in:
Egil Moeller 2012-03-02 22:00:20 +01:00
commit ce5d2d8685
35 changed files with 1839 additions and 1037 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/package.json
View file

@ -10,14 +10,16 @@
"name": "Robin Buse" }
],
"dependencies" : {
"yajsml" : "1.1.2",
"request" : "2.9.100",
"require-kernel" : "1.0.3",
"socket.io" : "0.8.7",
"ueberDB" : "0.1.7",
"async" : "0.1.15",
"express" : "2.5.0",
"async" : "0.1.18",
"express" : "2.5.8",
"clean-css" : "0.3.2",
"uglify-js" : "1.2.5",
"formidable" : "1.0.7",
"formidable" : "1.0.9",
"log4js" : "0.4.1",
"jsdom-nocontextifiy" : "0.2.10",
"async-stacktrace" : "0.0.2",