Merge branch 'webpack'

PaulLeCam · Oct 4, 2015 · 8751e71 · 8751e71
2 parents 91d4220 + 4709690
commit 8751e71
Show file tree

Hide file tree

Showing 5 changed files with 5,199 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 sudo: false
 language: node_js
 node_js:
-  - "iojs"
+  - 4