Merge branch 'greenkeeper-dotest-1.2.1' into develop

Conflicts: package.json
fvdm · Mar 29, 2016 · de1abb6 · de1abb6
2 parents edade57 + 96b93b8
commit de1abb6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "httpreq": "^0.4.16"
   },
   "devDependencies": {
-    "dotest": "^1.1.0",
+    "dotest": "^1.2.1",
     "eslint": "^2.5.1"
   },
   "optionalDependencies": {},