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

Conflicts: composer.json public/build/admin/fonts/sulu.0a81d32d65c76800caef704f889a263f.svg public/build/admin/fonts/sulu.153f8fb287f24de2a2344dcecd0a25f6.svg public/build/admin/fonts/sulu.220ed5f90cc9c0818c916197d4c8008b.svg public/build/admin/fonts/sulu.4a6163fe75314165af354ec7218b98b4.woff public/build/admin/fonts/sulu.80443f146bf6eaecaf433d7a67c42f15.ttf public/build/admin/fonts/sulu.bbd7b4372d028ab8242191e5d460aae4.ttf public/build/admin/fonts/sulu.c164c4922c6aad67724e0e322a7921bf.woff public/build/admin/fonts/sulu.cf0d2bf9640231f4a1daccadd6200344.ttf public/build/admin/fonts/sulu.f9c6f8a5ae043a82260097cb943e7052.woff public/build/admin/main.00466617ba0d69fe26a8.js public/build/admin/main.00466617ba0d69fe26a8.js.map public/build/admin/main.6c6c6ce9bc79c1cd218b.css public/build/admin/main.6c6c6ce9bc79c1cd218b.js public/build/admin/main.6c6c6ce9bc79c1cd218b.js.map public/build/admin/main.f0ea2d53b0e0bc93a878.js public/build/admin/main.f0ea2d53b0e0bc93a878.js.map public/build/admin/manifest.json
sulu · Nov 9, 2022 · 49db86f · 49db86f
2 parents 6384df0 + 8c8737c
commit 49db86f
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 90 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.2",
+        "sulu/sulu": "~2.5.3",
         "symfony/config": "^6.0",
         "symfony/dotenv": "^6.0",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...sulu.0a81d32d65c76800caef704f889a263f.svg → ...sulu.020dbc987e31a9d44dee3df6be166a38.svg b/...sulu.0a81d32d65c76800caef704f889a263f.svg → ...sulu.020dbc987e31a9d44dee3df6be166a38.svg
diff --git a/...ulu.c164c4922c6aad67724e0e322a7921bf.woff → ...sulu.a6db07a93499f7c2a8776e248f72fbe9.ttf b/...ulu.c164c4922c6aad67724e0e322a7921bf.woff → ...sulu.a6db07a93499f7c2a8776e248f72fbe9.ttf
diff --git a/...sulu.cf0d2bf9640231f4a1daccadd6200344.ttf → ...ulu.f1f68dfc871423975702a6847395eb71.woff b/...sulu.cf0d2bf9640231f4a1daccadd6200344.ttf → ...ulu.f1f68dfc871423975702a6847395eb71.woff
diff --git a/...build/admin/main.00466617ba0d69fe26a8.css → ...build/admin/main.a5496ccf8d3035918759.css b/...build/admin/main.00466617ba0d69fe26a8.css → ...build/admin/main.a5496ccf8d3035918759.css
diff --git a/.../build/admin/main.00466617ba0d69fe26a8.js → .../build/admin/main.a5496ccf8d3035918759.js b/.../build/admin/main.00466617ba0d69fe26a8.js → .../build/admin/main.a5496ccf8d3035918759.js
diff --git a/...ld/admin/main.00466617ba0d69fe26a8.js.map → ...ld/admin/main.a5496ccf8d3035918759.js.map b/...ld/admin/main.00466617ba0d69fe26a8.js.map → ...ld/admin/main.a5496ccf8d3035918759.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.00466617ba0d69fe26a8.css",
-  "main.js": "/build/admin/main.00466617ba0d69fe26a8.js",
-  "main.js.map": "/build/admin/main.00466617ba0d69fe26a8.js.map",
+  "main.css": "/build/admin/main.a5496ccf8d3035918759.css",
+  "main.js": "/build/admin/main.a5496ccf8d3035918759.js",
+  "main.js.map": "/build/admin/main.a5496ccf8d3035918759.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",
@@ -67,9 +67,9 @@
   "build/admin/fonts/open-sans-v15-latin-regular.woff": "/build/admin/fonts/open-sans-v15-latin-regular.87a454b233bedae23f8d1be11e8b4f68.woff",
   "build/admin/fonts/open-sans-v15-latin-regular.eot": "/build/admin/fonts/open-sans-v15-latin-regular.a356e361ee6765f3d6d4c1d4664f12ab.eot",
   "build/admin/fonts/open-sans-v15-latin-regular.woff2": "/build/admin/fonts/open-sans-v15-latin-regular.ec806460121999bcfb12bc264d46d41e.woff2",
-  "build/admin/fonts/sulu.svg?74wnpt": "/build/admin/fonts/sulu.0a81d32d65c76800caef704f889a263f.svg",
-  "build/admin/fonts/sulu.woff?74wnpt": "/build/admin/fonts/sulu.c164c4922c6aad67724e0e322a7921bf.woff",
-  "build/admin/fonts/sulu.ttf?74wnpt": "/build/admin/fonts/sulu.cf0d2bf9640231f4a1daccadd6200344.ttf",
+  "build/admin/fonts/sulu.svg?74wnpt": "/build/admin/fonts/sulu.020dbc987e31a9d44dee3df6be166a38.svg",
+  "build/admin/fonts/sulu.ttf?74wnpt": "/build/admin/fonts/sulu.a6db07a93499f7c2a8776e248f72fbe9.ttf",
+  "build/admin/fonts/sulu.woff?74wnpt": "/build/admin/fonts/sulu.f1f68dfc871423975702a6847395eb71.woff",
   "build/admin/images/checkerBackground.gif": "/build/admin/images/checkerBackground.9883f9a87851b3f982e6e6ac284c2f4e.gif",
   "build/admin/images/layers-2x.png": "/build/admin/images/layers-2x.8f2c4d11474275fbc1614b9098334eae.png",
   "build/admin/images/layers.png": "/build/admin/images/layers.416d91365b44e4b4f4777663e6f009f3.png",