Merge branch 'master' into greenkeeper-phantomjs-2.1.3

marionebl · Feb 14, 2016 · 6ee0a56 · 6ee0a56
2 parents cf2e79e + cdb6e72
commit 6ee0a56
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -145,7 +145,7 @@
     "istanbul": "0.4.2",
     "js-git": "0.7.7",
     "lodash.flatten": "4.0.0",
-    "lodash.merge": "4.0.3",
+    "lodash.merge": "4.1.0",
     "mdast": "2.3.2",
     "mdast-highlight.js": "1.2.0",
     "mdast-html": "1.2.1",