Merge branch 'master' of https://github.com/Nekoya3/StudyAtHome

� Conflicts:
�	package.json
�	yarn.lock

Author: NEKOYASAN

package.json

@@ -34,7 +34,7 @@
     "cross-env": "^7.0.2",
     "dayjs": "^1.8.26",
     "express": "^4.17.1",
-    "firebase": "^7.14.2",
+    "firebase": "^7.14.3",
     "firebase-admin": "^8.12.0",
     "js-cookie": "^2.2.1",
     "jwt-decode": "^2.2.0",