aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--npm-shrinkwrap.json11
-rw-r--r--package.json2
2 files changed, 5 insertions, 8 deletions
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a72db7c9..a83767c4 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1967,7 +1967,7 @@
}
},
"karma": {
- "version": "0.11.12",
+ "version": "0.12.0",
"dependencies": {
"di": {
"version": "0.0.1"
@@ -2083,9 +2083,6 @@
}
}
},
- "coffee-script": {
- "version": "1.6.3"
- },
"rimraf": {
"version": "2.2.6"
},
@@ -2102,7 +2099,7 @@
"version": "1.2.11"
},
"log4js": {
- "version": "0.6.10",
+ "version": "0.6.12",
"dependencies": {
"async": {
"version": "0.1.15"
@@ -2111,7 +2108,7 @@
"version": "1.1.4"
},
"readable-stream": {
- "version": "1.0.26",
+ "version": "1.0.26-2",
"dependencies": {
"string_decoder": {
"version": "0.10.25-1"
@@ -2206,7 +2203,7 @@
}
},
"source-map": {
- "version": "0.1.32",
+ "version": "0.1.33",
"dependencies": {
"amdefine": {
"version": "0.1.0"
diff --git a/package.json b/package.json
index f7f3adc7..baf57bd4 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"q-io": "~1.10.6",
"qq": "~0.3.5",
"shelljs": "~0.2.6",
- "karma": "0.11.12",
+ "karma": "^0.12.0",
"karma-jasmine": "0.1.5",
"karma-chrome-launcher": "0.1.2",
"karma-firefox-launcher": "0.1.3",