Merge branch 'develop' of https://github.com/nakazawakan/kikikanri into fe_fix

2022-01-10 23:02:59 -08:00 · 2022-01-10 23:02:59 -08:00 · 4ecb9fd429
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/public/css/app.css
+++ b/backend/public/css/app.css
@ -12897,7 +12897,7 @@ categories: [project]
@font-face {
  font-family: "iconfont";
  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2);
-  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?9e48c54f8bbb472c1c286234fdd6636f) format("svg");
+  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?d812f238f7ec32f5cb5ebd322f320a02) format("svg");
  font-weight: normal;
  font-style: normal;
 }
--- a/backend/public/js/app.js
+++ b/backend/public/js/app.js