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 'develop' into express-v3

Browse source 
Conflicts:
	src/node/hooks/express/errorhandling.js
This commit is contained in:
Marcel Klehr 2012-10-03 10:09:00 +02:00
commit 2684a1d295
23 changed files with 628 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/package.json
View file

@ -10,7 +10,7 @@
"name": "Robin Buse" }
],
"dependencies" : {
"yajsml" : "1.1.4",
"yajsml" : "1.1.5",
"request" : "2.9.100",
"require-kernel" : "1.0.5",
"resolve" : "0.2.x",
@ -42,5 +42,5 @@
"engines" : { "node" : ">=0.6.0",
"npm" : ">=1.0"
},
"version" : "1.0.0"
"version" : "1.1.2"
}