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

Conflicts: composer.json public/build/admin/main.2a0bf9983f4aa95ccad8.css public/build/admin/main.2a0bf9983f4aa95ccad8.js public/build/admin/main.2a0bf9983f4aa95ccad8.js.map public/build/admin/main.4a73052b5c06e625e12e.js.map public/build/admin/main.cf0bdf1921fcfef2e3de.js.map public/build/admin/manifest.json
sulu · Mar 29, 2024 · 175e010 · 175e010
2 parents 83593cc + a9c7138
commit 175e010
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "scheb/2fa-email": "^7.2",
         "scheb/2fa-trusted-device": "^7.2",
         "stof/doctrine-extensions-bundle": "^1.8",
-        "sulu/sulu": "~2.6.0@dev",
+        "sulu/sulu": "~2.6.0-RC1",
         "symfony/config": "^6.4",
         "symfony/dotenv": "^6.4",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...build/admin/main.cf0bdf1921fcfef2e3de.css → ...build/admin/main.2522543b6fd5a79eaa59.css b/...build/admin/main.cf0bdf1921fcfef2e3de.css → ...build/admin/main.2522543b6fd5a79eaa59.css
diff --git a/...d/admin/main.cf0bdf1921fcfef2e3de.css.map → ...d/admin/main.2522543b6fd5a79eaa59.css.map b/...d/admin/main.cf0bdf1921fcfef2e3de.css.map → ...d/admin/main.2522543b6fd5a79eaa59.css.map
diff --git a/.../build/admin/main.cf0bdf1921fcfef2e3de.js → .../build/admin/main.2522543b6fd5a79eaa59.js b/.../build/admin/main.cf0bdf1921fcfef2e3de.js → .../build/admin/main.2522543b6fd5a79eaa59.js
diff --git a/.../main.cf0bdf1921fcfef2e3de.js.LICENSE.txt → .../main.2522543b6fd5a79eaa59.js.LICENSE.txt b/.../main.cf0bdf1921fcfef2e3de.js.LICENSE.txt → .../main.2522543b6fd5a79eaa59.js.LICENSE.txt
diff --git a/...ld/admin/main.cf0bdf1921fcfef2e3de.js.map → ...ld/admin/main.2522543b6fd5a79eaa59.js.map b/...ld/admin/main.cf0bdf1921fcfef2e3de.js.map → ...ld/admin/main.2522543b6fd5a79eaa59.js.map
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.cf0bdf1921fcfef2e3de.css",
-  "main.js": "/build/admin/main.cf0bdf1921fcfef2e3de.js",
+  "main.css": "/build/admin/main.2522543b6fd5a79eaa59.css",
+  "main.js": "/build/admin/main.2522543b6fd5a79eaa59.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.cf0bdf1921fcfef2e3de.css.map",
-  "main.js.map": "/build/admin/main.cf0bdf1921fcfef2e3de.js.map"
+  "main.css.map": "/build/admin/main.2522543b6fd5a79eaa59.css.map",
+  "main.js.map": "/build/admin/main.2522543b6fd5a79eaa59.js.map"
 }