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

Conflicts: composer.json public/build/admin/main.47a8fefff3fabc32410d.js public/build/admin/main.47a8fefff3fabc32410d.js.map public/build/admin/main.bd4c2fa0f1728f812687.css public/build/admin/main.bd4c2fa0f1728f812687.js public/build/admin/main.bd4c2fa0f1728f812687.js.map public/build/admin/main.db791025e7cedcfd061c.js public/build/admin/main.db791025e7cedcfd061c.js.map public/build/admin/manifest.json
sulu · May 2, 2024 · d60a649 · d60a649
2 parents 2699f5d + b43eb34
commit d60a649
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 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.15",
+        "sulu/sulu": "~2.5.16",
         "symfony/config": "^6.3",
         "symfony/dotenv": "^6.3",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...build/admin/main.47a8fefff3fabc32410d.css → ...build/admin/main.60ba88d0ae8b24353a64.css b/...build/admin/main.47a8fefff3fabc32410d.css → ...build/admin/main.60ba88d0ae8b24353a64.css
diff --git a/.../build/admin/main.47a8fefff3fabc32410d.js → .../build/admin/main.60ba88d0ae8b24353a64.js b/.../build/admin/main.47a8fefff3fabc32410d.js → .../build/admin/main.60ba88d0ae8b24353a64.js
diff --git a/...ld/admin/main.47a8fefff3fabc32410d.js.map → ...ld/admin/main.60ba88d0ae8b24353a64.js.map b/...ld/admin/main.47a8fefff3fabc32410d.js.map → ...ld/admin/main.60ba88d0ae8b24353a64.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.47a8fefff3fabc32410d.css",
-  "main.js": "/build/admin/main.47a8fefff3fabc32410d.js",
-  "main.js.map": "/build/admin/main.47a8fefff3fabc32410d.js.map",
+  "main.css": "/build/admin/main.60ba88d0ae8b24353a64.css",
+  "main.js": "/build/admin/main.60ba88d0ae8b24353a64.js",
+  "main.js.map": "/build/admin/main.60ba88d0ae8b24353a64.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",