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

…into develop
wasedatime · Nov 27, 2021 · f5c608b · f5c608b
2 parents f8207e4 + ff8b673
commit f5c608b
Show file tree

Hide file tree

Showing 2 changed files with 295 additions and 248 deletions.
diff --git a/root/package.json b/root/package.json
@@ -108,7 +108,7 @@
     "react-router-dom": "^5.3.0",
     "react-vertical-timeline-component": "^3.5.2",
     "single-spa": "^5.9.3",
-    "single-spa-layout": "1.4.0",
+    "single-spa-layout": "1.6.0",
     "single-spa-react": "^4.6.0",
     "styled-components": "^5.3.3",
     "ts-loader": "^9.2.6",