Merge branch 'develop' of git://github.com/Pita/etherpad-lite

This commit is contained in:
Egil Moeller 2012-03-27 22:36:48 +02:00
commit 6120a0b7aa
20 changed files with 1197 additions and 295 deletions

View file

@ -23,14 +23,13 @@
"log4js" : "0.4.1",
"jsdom-nocontextifiy" : "0.2.10",
"async-stacktrace" : "0.0.2",
"npm" : "1.1",
"ejs" : "0.6.1",
"node.extend" : "1.0.0",
"graceful-fs" : "1.1.5",
"slide" : "1.1.3",
"semver" : "1.0.13"
"semver" : "1.0.13",
"underscore" : "1.3.1"
},
"devDependencies": {
"jshint" : "*"