Merge branch 'master' into greenkeeper/debug-2.6.0

mochajs · Jan 2, 2017 · 5246303 · 5246303
2 parents 6f03ad3 + 9a8b431
commit 5246303
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -305,7 +305,7 @@
     "browser-stdout": "1.3.0",
     "commander": "2.9.0",
     "debug": "2.6.0",
-    "diff": "3.1.0",
+    "diff": "3.2.0",
     "escape-string-regexp": "1.0.5",
     "glob": "7.1.1",
     "growl": "1.9.2",