chore: Merge branch 'mgcrea-master'

* mgcrea-master: chore(npm): bump chokidar and test against node@^6.0 (fixes #824)
remy · Apr 29, 2016 · ceadfb8 · ceadfb8
2 parents 72a3b35 + 6c9cac8
commit ceadfb8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ language: node_js
 notifications:
   email: false
 node_js:
+  - 6
   - 5
   - 4
   # - iojs-v3

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "semantic-release": "4.3.5"
   },
   "dependencies": {
-    "chokidar": "^1.2.0",
+    "chokidar": "^1.4.3",
     "debug": "^2.2.0",
     "es6-promise": "^3.0.2",
     "ignore-by-default": "^1.0.0",