Merge branch 'develop' of https://github.com/wasedatime/wasedatime-web …

…into develop
wasedatime · Nov 27, 2021 · f8207e4 · f8207e4
2 parents 768a5c5 + 555f13f
commit f8207e4
Show file tree

Hide file tree

Showing 6 changed files with 1,251 additions and 1,255 deletions.
diff --git a/campus/package.json b/campus/package.json
@@ -65,7 +65,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.16",
     "@types/jest": "^26.0.24",
-    "@types/react": "^16.14.20",
+    "@types/react": "17.0.37",
     "@types/react-dom": "^16.9.14",
     "@types/systemjs": "^6.1.1",
     "@types/webpack-env": "^1.16.3",