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

Conflicts: composer.json public/build/admin/main.8a0d0aef27ccf80c6832.js.map public/build/admin/main.dd9be1fb9487f84d3a24.js.map public/build/admin/main.e03b63637014e59a633b.css public/build/admin/main.e03b63637014e59a633b.js public/build/admin/main.e03b63637014e59a633b.js.map public/build/admin/manifest.json
sulu · May 16, 2024 · 6f9ff17 · 6f9ff17
2 parents 50a9d38 + aff7ebf
commit 6f9ff17
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 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.8",
-        "sulu/sulu": "~2.6.1",
+        "sulu/sulu": "~2.6.2",
         "symfony/config": "^6.4",
         "symfony/dotenv": "^6.4",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...build/admin/main.dd9be1fb9487f84d3a24.css → ...build/admin/main.2db16dded2300b31a974.css b/...build/admin/main.dd9be1fb9487f84d3a24.css → ...build/admin/main.2db16dded2300b31a974.css
diff --git a/public/build/admin/main.2db16dded2300b31a974.css.map b/public/build/admin/main.2db16dded2300b31a974.css.map
diff --git a/.../build/admin/main.dd9be1fb9487f84d3a24.js → .../build/admin/main.2db16dded2300b31a974.js b/.../build/admin/main.dd9be1fb9487f84d3a24.js → .../build/admin/main.2db16dded2300b31a974.js
diff --git a/.../main.dd9be1fb9487f84d3a24.js.LICENSE.txt → .../main.2db16dded2300b31a974.js.LICENSE.txt b/.../main.dd9be1fb9487f84d3a24.js.LICENSE.txt → .../main.2db16dded2300b31a974.js.LICENSE.txt
diff --git a/...ld/admin/main.dd9be1fb9487f84d3a24.js.map → ...ld/admin/main.2db16dded2300b31a974.js.map b/...ld/admin/main.dd9be1fb9487f84d3a24.js.map → ...ld/admin/main.2db16dded2300b31a974.js.map
diff --git a/public/build/admin/main.dd9be1fb9487f84d3a24.css.map b/public/build/admin/main.dd9be1fb9487f84d3a24.css.map
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "/build/admin/main.dd9be1fb9487f84d3a24.css",
-  "main.js": "/build/admin/main.dd9be1fb9487f84d3a24.js",
+  "main.css": "/build/admin/main.2db16dded2300b31a974.css",
+  "main.js": "/build/admin/main.2db16dded2300b31a974.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.dd9be1fb9487f84d3a24.css.map",
-  "main.js.map": "/build/admin/main.dd9be1fb9487f84d3a24.js.map"
+  "main.css.map": "/build/admin/main.2db16dded2300b31a974.css.map",
+  "main.js.map": "/build/admin/main.2db16dded2300b31a974.js.map"
 }
diff --git a/symfony.lock b/symfony.lock
@@ -14,7 +14,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "main",
             "version": "2.12",
-            "ref": "a952424ca4d5ab4dbc66c8be78236a5f13124112"
+            "ref": "7b1b0b637b337f6beb895589948cd119da705524"
         },
         "files": [
             "config/packages/doctrine.yaml",