Merge branch 'master' into filter_warnings

styled-components · Sep 17, 2018 · e50ea18 · e50ea18
2 parents 9a4fd9c + b0a1fec
commit e50ea18
Show file tree

Hide file tree

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