Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change

pull/2350/head
John McLear 2014-11-29 00:56:14 +00:00
commit 71a31a0fc8
1 changed files with 19 additions and 19 deletions

View File

@ -12,35 +12,35 @@
], ],
"dependencies" : { "dependencies" : {
"yajsml" : "1.1.6", "yajsml" : "1.1.6",
"request" : "2.9.100", "request" : ">=2.48.0",
"etherpad-require-kernel" : "1.0.5", "etherpad-require-kernel" : ">=1.0.7",
"resolve" : ">=1.0.0", "resolve" : ">=1.0.0",
"socket.io" : ">=1.2.0", "socket.io" : ">=1.2.0",
"ueberDB" : ">=0.2.9", "ueberDB" : ">=0.2.9",
"express" : ">3.1.0 <3.9.0", "express" : ">3.1.0 <3.9.0",
"async" : "0.1.x", "async" : ">=0.9.0",
"connect" : "2.7.x", "connect" : "2.7.x",
"clean-css" : "0.3.2", "clean-css" : ">=0.50.x",
"uglify-js" : "1.2.5", "uglify-js" : ">=2.4.15",
"formidable" : "1.0.9", "formidable" : ">=1.0.15",
"log4js" : "0.6.6", "log4js" : ">=0.6.21",
"nodemailer" : "0.3.x", "nodemailer" : "0.3.x",
"cheerio" : "0.18.0", "cheerio" : ">=0.18.0",
"async-stacktrace" : "0.0.2", "async-stacktrace" : ">=0.0.2",
"npm" : "1.4.x", "npm" : ">=2.1.x",
"ejs" : "0.6.1", "ejs" : ">=1.0.0",
"graceful-fs" : "1.1.5", "graceful-fs" : ">=3.0.4",
"slide" : "1.1.3", "slide" : ">=1.1.6",
"semver" : ">2.3.0", "semver" : ">=2.3.0",
"security" : "1.0.0", "security" : "1.0.0",
"tinycon" : "0.0.1", "tinycon" : ">=0.0.1",
"underscore" : "1.5.1", "underscore" : "1.5.1",
"unorm" : "1.0.0", "unorm" : ">=1.3.3",
"languages4translatewiki" : "0.1.3", "languages4translatewiki" : ">=0.1.3",
"swagger-node-express" : ">=2.1.0", "swagger-node-express" : ">=2.1.0",
"channels" : "0.0.x", "channels" : "0.0.x",
"jsonminify" : "0.2.2", "jsonminify" : ">=0.2.3",
"measured" : "0.1.3", "measured" : ">=0.1.6",
"mocha" : ">=2.0.1", "mocha" : ">=2.0.1",
"supertest" : ">=0.15.0" "supertest" : ">=0.15.0"
}, },