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

This commit is contained in:
John McLear 2014-11-28 17:43:01 +00:00
commit 3bf9f3cf1d
8 changed files with 654 additions and 5 deletions

View file

@ -40,7 +40,9 @@
"swagger-node-express" : ">=2.1.0",
"channels" : "0.0.x",
"jsonminify" : "0.2.2",
"measured" : "0.1.3"
"measured" : "0.1.3",
"mocha" : ">=2.0.1",
"supertest" : ">=0.15.0"
},
"bin": { "etherpad-lite": "./node/server.js" },
"devDependencies": {