Merge branch 'master' into clever_guess

styled-components · Sep 27, 2018 · 8c2f5d1 · 8c2f5d1
2 parents 9f6c4b6 + 1c16989
commit 8c2f5d1
Show file tree

Hide file tree

Showing 14 changed files with 6,813 additions and 2,787 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    ["env", {
+    ["@babel/preset-env", {
       "targets": {
         "node": 6
       }