Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
This commit is contained in:
commit
937524ab8c
|
@ -29,7 +29,8 @@
|
||||||
"graceful-fs" : "1.1.5",
|
"graceful-fs" : "1.1.5",
|
||||||
"slide" : "1.1.3",
|
"slide" : "1.1.3",
|
||||||
"semver" : "1.0.13",
|
"semver" : "1.0.13",
|
||||||
"underscore" : "1.3.1"
|
"underscore" : "1.3.1",
|
||||||
|
"resolve" : "0.2.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"jshint" : "*"
|
"jshint" : "*"
|
||||||
|
|
Loading…
Reference in New Issue