Merge branch 'dev' into import_pal

VOCC · Apr 17, 2020 · 7231c5c · 7231c5c
2 parents 9ac1889 + 17558f1
commit 7231c5c
Show file tree

Hide file tree

Showing 32 changed files with 1,951 additions and 15,673 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "react-dom": "^16.12.0",
     "react-modal": "^3.11.2",
     "react-native-svg": "^11.0.1",
-    "react-scripts": "^3.3.0",
+    "react-scripts": "3.4.1",
     "save-as": "^0.1.8",
     "typescript": "3.7.2"
   },
@@ -50,4 +50,4 @@
   "devDependencies": {
     "@types/node": "^12.12.7"
   }
-}
+}