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

Conflicts: composer.json public/build/admin/main.57356961d1814657a5b8.js public/build/admin/main.57356961d1814657a5b8.js.map public/build/admin/main.6d56d2cf15b101a74302.js public/build/admin/main.6d56d2cf15b101a74302.js.map public/build/admin/main.f485293ba4805c17028d.css public/build/admin/main.f485293ba4805c17028d.js public/build/admin/main.f485293ba4805c17028d.js.map public/build/admin/manifest.json
sulu · Feb 5, 2024 · 7e771c0 · 7e771c0
2 parents 1bf9e99 + 5298d7f
commit 7e771c0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "scheb/2fa-email": "^6.1",
         "scheb/2fa-trusted-device": "^6.1",
         "stof/doctrine-extensions-bundle": "^1.8",
-        "sulu/sulu": "~2.5.11",
+        "sulu/sulu": "~2.5.12",
         "symfony/config": "^6.3",
         "symfony/dotenv": "^6.3",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...build/admin/main.57356961d1814657a5b8.css → ...build/admin/main.4a73052b5c06e625e12e.css b/...build/admin/main.57356961d1814657a5b8.css → ...build/admin/main.4a73052b5c06e625e12e.css
diff --git a/.../build/admin/main.57356961d1814657a5b8.js → .../build/admin/main.4a73052b5c06e625e12e.js b/.../build/admin/main.57356961d1814657a5b8.js → .../build/admin/main.4a73052b5c06e625e12e.js
diff --git a/...ld/admin/main.57356961d1814657a5b8.js.map → ...ld/admin/main.4a73052b5c06e625e12e.js.map b/...ld/admin/main.57356961d1814657a5b8.js.map → ...ld/admin/main.4a73052b5c06e625e12e.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.57356961d1814657a5b8.css",
-  "main.js": "/build/admin/main.57356961d1814657a5b8.js",
-  "main.js.map": "/build/admin/main.57356961d1814657a5b8.js.map",
+  "main.css": "/build/admin/main.4a73052b5c06e625e12e.css",
+  "main.js": "/build/admin/main.4a73052b5c06e625e12e.js",
+  "main.js.map": "/build/admin/main.4a73052b5c06e625e12e.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",