Merge branch '2.4' of github.com:sulu/skeleton into 2.5

Conflicts: composer.json public/build/admin/main.34afd7aad6868afb55de.js public/build/admin/main.34afd7aad6868afb55de.js.map public/build/admin/main.63320ca4f6a92a403a92.js public/build/admin/main.63320ca4f6a92a403a92.js.map public/build/admin/main.ef2a1fc36ddb231793ff.css public/build/admin/main.ef2a1fc36ddb231793ff.js public/build/admin/main.ef2a1fc36ddb231793ff.js.map public/build/admin/manifest.json
sulu · Apr 12, 2023 · eb5158c · eb5158c
2 parents fb2e84f + 21bd601
commit eb5158c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "scheb/2fa-bundle": "^6.1",
         "scheb/2fa-email": "^6.1",
         "scheb/2fa-trusted-device": "^6.1",
-        "sulu/sulu": "~2.5.8",
+        "sulu/sulu": "~2.5.9",
         "symfony/config": "^6.2",
         "symfony/dotenv": "^6.2",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...build/admin/main.34afd7aad6868afb55de.css → ...build/admin/main.a5a185ce48d4ebdd1c1b.css b/...build/admin/main.34afd7aad6868afb55de.css → ...build/admin/main.a5a185ce48d4ebdd1c1b.css
diff --git a/.../build/admin/main.34afd7aad6868afb55de.js → .../build/admin/main.a5a185ce48d4ebdd1c1b.js b/.../build/admin/main.34afd7aad6868afb55de.js → .../build/admin/main.a5a185ce48d4ebdd1c1b.js
diff --git a/...ld/admin/main.34afd7aad6868afb55de.js.map → ...ld/admin/main.a5a185ce48d4ebdd1c1b.js.map b/...ld/admin/main.34afd7aad6868afb55de.js.map → ...ld/admin/main.a5a185ce48d4ebdd1c1b.js.map
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,7 +1,7 @@
 {
-  "main.css": "/build/admin/main.34afd7aad6868afb55de.css",
-  "main.js": "/build/admin/main.34afd7aad6868afb55de.js",
-  "main.js.map": "/build/admin/main.34afd7aad6868afb55de.js.map",
+  "main.css": "/build/admin/main.a5a185ce48d4ebdd1c1b.css",
+  "main.js": "/build/admin/main.a5a185ce48d4ebdd1c1b.js",
+  "main.js.map": "/build/admin/main.a5a185ce48d4ebdd1c1b.js.map",
   "build/admin/fonts/fa-brands-400.woff": "/build/admin/fonts/fa-brands-400.2285773e6b4b172f07d9b777c81b0775.woff",
   "build/admin/fonts/fa-brands-400.eot": "/build/admin/fonts/fa-brands-400.23f19bb08961f37aaf692ff943823453.eot",
   "build/admin/fonts/fa-brands-400.svg": "/build/admin/fonts/fa-brands-400.2f517e09eb2ca6650ff5bec5a95157ab.svg",