Merge branch 'master' into greenkeeper/eslint-5.15.2

jessebeach · web-flow · commit d9fbce06cdfa · 2019-05-29T10:36:59.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -46,3 +46,5 @@ matrix:
     - node_js: "5"
     - node_js: "4" # not sure why this is failing; probably something in jest
       env: ESLINT=4
+    - node_js: "4"
+      env: ESLINT=3
