Merge branch 'development'

TillaTheHun0 · Oct 15, 2018 · af76aab · af76aab
2 parents 81bb19e + e000583
commit af76aab
Show file tree

Hide file tree

Showing 8 changed files with 4,941 additions and 2,039 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,6 @@
-{ 
+{
     "presets": [
-      ["env"]
-    ]
-  }
+      ["@babel/env"]
+    ],
+    "plugins": ["@babel/plugin-proposal-object-rest-spread"]
+  }