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

Conflicts: composer.json public/build/admin/main.2d1ed8c203eb02fcd883.css public/build/admin/main.2d1ed8c203eb02fcd883.js public/build/admin/main.2d1ed8c203eb02fcd883.js.map public/build/admin/main.7dd0d023ca48ee986043.js.map public/build/admin/main.b4a850e0494cb3498980.js.map public/build/admin/manifest.json
sulu · Nov 27, 2024 · c024b4f · c024b4f
2 parents 4a2e773 + 106a76b
commit c024b4f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "scheb/2fa-email": "^7.2",
         "scheb/2fa-trusted-device": "^7.2",
         "stof/doctrine-extensions-bundle": "^1.11",
-        "sulu/sulu": "^2.6.x-dev",
+        "sulu/sulu": "~2.6.6",
         "symfony/config": "^7.1",
         "symfony/dotenv": "^7.1",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...build/admin/main.7dd0d023ca48ee986043.css → ...build/admin/main.23106151c27dd616377c.css b/...build/admin/main.7dd0d023ca48ee986043.css → ...build/admin/main.23106151c27dd616377c.css
diff --git a/...d/admin/main.7dd0d023ca48ee986043.css.map → ...d/admin/main.23106151c27dd616377c.css.map b/...d/admin/main.7dd0d023ca48ee986043.css.map → ...d/admin/main.23106151c27dd616377c.css.map
diff --git a/public/build/admin/main.23106151c27dd616377c.js b/public/build/admin/main.23106151c27dd616377c.js
diff --git a/.../main.7dd0d023ca48ee986043.js.LICENSE.txt → .../main.23106151c27dd616377c.js.LICENSE.txt b/.../main.7dd0d023ca48ee986043.js.LICENSE.txt → .../main.23106151c27dd616377c.js.LICENSE.txt
diff --git a/...ld/admin/main.7dd0d023ca48ee986043.js.map → ...ld/admin/main.23106151c27dd616377c.js.map b/...ld/admin/main.7dd0d023ca48ee986043.js.map → ...ld/admin/main.23106151c27dd616377c.js.map
diff --git a/public/build/admin/main.7dd0d023ca48ee986043.js b/public/build/admin/main.7dd0d023ca48ee986043.js
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.7dd0d023ca48ee986043.css",
-  "main.js": "/build/admin/main.7dd0d023ca48ee986043.js",
+  "main.css": "/build/admin/main.23106151c27dd616377c.css",
+  "main.js": "/build/admin/main.23106151c27dd616377c.js",
   "fa-solid-900.svg": "/build/admin/fa-solid-900.7a8b4f130182d19a2d7c.svg",
   "fa-brands-400.svg": "/build/admin/fa-brands-400.2f517e09eb2ca6650ff5.svg",
   "fa-solid-900.eot": "/build/admin/fa-solid-900.9bbb245e67a133f6e486.eot",
@@ -77,6 +77,6 @@
   "images/layers.png": "/build/admin/images/layers.416d91365b44e4b4f477.png",
   "images/marker-shadow.png": "/build/admin/images/marker-shadow.a0c6cc1401c107b501ef.png",
   "images/checkerBackground.gif": "/build/admin/images/checkerBackground.9883f9a87851b3f982e6.gif",
-  "main.css.map": "/build/admin/main.7dd0d023ca48ee986043.css.map",
-  "main.js.map": "/build/admin/main.7dd0d023ca48ee986043.js.map"
+  "main.css.map": "/build/admin/main.23106151c27dd616377c.css.map",
+  "main.js.map": "/build/admin/main.23106151c27dd616377c.js.map"
 }