merging dev into branch

2021-07-22 09:53:32 -07:00
parent e09ce9bd41 83105fb7ca
commit 856364370f
26 changed files with 3619 additions and 240 deletions
--- a/package.json
+++ b/package.json
@@ -44,5 +44,8 @@
  },
  "devDependencies": {
    "react-test-renderer": "^17.0.2"
+  },
+  "jest": {
+    "globalSetup": "./testEnv.js"
  }
 }