Merge branch 'dev'

cheton · May 18, 2016 · bc0ff46 · bc0ff46
2 parents 476eb62 + 15b59f7
commit bc0ff46
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ os:
   - linux
 
 node_js:
+  - '6'
   - '5'
   - '4'
   - '0.12'