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

Conflicts: composer.json public/build/admin/main.aecd881801bfbeee30b7.js public/build/admin/main.aecd881801bfbeee30b7.js.map public/build/admin/main.ef6036a12ebb40ac33b3.js public/build/admin/main.ef6036a12ebb40ac33b3.js.map public/build/admin/main.f0ea2d53b0e0bc93a878.css public/build/admin/main.f0ea2d53b0e0bc93a878.js public/build/admin/main.f0ea2d53b0e0bc93a878.js.map public/build/admin/manifest.json
sulu · Oct 28, 2022 · 6384df0 · 6384df0
2 parents 9f6f4d5 + edb1be6
commit 6384df0
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 94 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.1",
+        "sulu/sulu": "~2.5.2",
         "symfony/config": "^6.0",
         "symfony/dotenv": "^6.0",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/public/build/admin/main.00466617ba0d69fe26a8.css b/public/build/admin/main.00466617ba0d69fe26a8.css
diff --git a/.../build/admin/main.ef6036a12ebb40ac33b3.js → .../build/admin/main.00466617ba0d69fe26a8.js b/.../build/admin/main.ef6036a12ebb40ac33b3.js → .../build/admin/main.00466617ba0d69fe26a8.js
diff --git a/...ld/admin/main.ef6036a12ebb40ac33b3.js.map → ...ld/admin/main.00466617ba0d69fe26a8.js.map b/...ld/admin/main.ef6036a12ebb40ac33b3.js.map → ...ld/admin/main.00466617ba0d69fe26a8.js.map
diff --git a/public/build/admin/main.ef6036a12ebb40ac33b3.css b/public/build/admin/main.ef6036a12ebb40ac33b3.css
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,7 +1,7 @@
 {
-  "main.css": "/build/admin/main.ef6036a12ebb40ac33b3.css",
-  "main.js": "/build/admin/main.ef6036a12ebb40ac33b3.js",
-  "main.js.map": "/build/admin/main.ef6036a12ebb40ac33b3.js.map",
+  "main.css": "/build/admin/main.00466617ba0d69fe26a8.css",
+  "main.js": "/build/admin/main.00466617ba0d69fe26a8.js",
+  "main.js.map": "/build/admin/main.00466617ba0d69fe26a8.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",