Merge remote-tracking branch 'refs/remotes/origin/staging' into staging

2023-08-30 17:43:19 +07:00
parent fc52c7ece6 d3fb049c97
commit 07589caba1
15 changed files with 6685 additions and 2276 deletions
--- a/public/dashboard/index.html
+++ b/public/dashboard/index.html
@@ -24,7 +24,11 @@
    content="The starting point for your next project with Minimal UI Kit, built on the newest version of Material-UI ©, ready to be customized to your style" />
  <meta name="keywords" content="react,material,kit,application,dashboard,admin,template" />
  <meta name="author" content="Minimal UI Kit" />
+<<<<<<< HEAD
+  <script type="module" crossorigin src="/assets/index.9b396686.js"></script>
+=======
  <script type="module" crossorigin src="/assets/index.da589e84.js"></script>
+>>>>>>> a54708abb5d46d7d7319730306a528d33d910895
  <link rel="stylesheet" href="/assets/index.c91e36b5.css">
 <link rel="manifest" href="/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/registerSW.js"></script></head>

--- a/public/dashboard/sw.js
+++ b/public/dashboard/sw.js
--- a/public/dashboard/workbox-e0782b83.js
+++ b/public/dashboard/workbox-e0782b83.js