!1 Merge back to master

Merge pull request !1 from dev branch
2018-05-27 21:32:55 +08:00 · 2018-05-27 21:32:55 +08:00 · 61a1c93f0f
commit 61a1c93f0f
parent 30c963a5f0
89 changed files with 15859 additions and 2 deletions
--- a/client/.babelrc
+++ b/client/.babelrc
@ -0,0 +1,3 @@
+{
+  "presets": ["env", "react", "stage-0", "stage-2"]
+}