Merge branch 'master' into patch-2

Bttstrp · Apr 11, 2018 · b00083f · b00083f
2 parents 49b643f + 7b4855e
commit b00083f
Show file tree

Hide file tree

Showing 10 changed files with 4,229 additions and 1,430 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,5 +1,8 @@
 {
   "extends": "airbnb-base",
   "parser": "babel-eslint",
-  "env": { "browser": true }
+  "env": {
+    "browser": true,
+    "jest": true
+  }
 }
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+9
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,2 @@
+language: node_js
+node_js: 9