Merge branch 'master' into patch-1

jergason · Jul 30, 2016 · 51782a8 · 51782a8
2 parents 4faa938 + fb28b25
commit 51782a8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,10 @@
 language: node_js
 node_js:
-  - "4.2"
-  - "4.1"
-  - "4.0"
+  - "node"
+  - "6"
+  - "5"
+  - "4"
   - "iojs"
   - "0.12"
   - "0.11"
   - "0.10"
-  - "0.8"
-  - "0.6"