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

This commit is contained in:
johnyma22 2012-04-20 23:16:19 +01:00
commit 937524ab8c
1 changed files with 2 additions and 1 deletions

View File

@ -29,7 +29,8 @@
"graceful-fs" : "1.1.5",
"slide" : "1.1.3",
"semver" : "1.0.13",
"underscore" : "1.3.1"
"underscore" : "1.3.1",
"resolve" : "0.2.1"
},
"devDependencies": {
"jshint" : "*"