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

Conflicts: composer.json public/build/admin/main.4292504a4ca5f128b5a3.css public/build/admin/main.4292504a4ca5f128b5a3.js public/build/admin/main.4292504a4ca5f128b5a3.js.map public/build/admin/main.ba81c95860982212e075.css public/build/admin/main.ba81c95860982212e075.js public/build/admin/main.ba81c95860982212e075.js.map public/build/admin/main.c47dae7ca6e8e1544d66.css public/build/admin/main.c47dae7ca6e8e1544d66.js public/build/admin/main.c47dae7ca6e8e1544d66.js.map public/build/admin/manifest.json
sulu · Jul 13, 2022 · 581ad8d · 581ad8d
2 parents 32f51a9 + 4070e6c
commit 581ad8d
Show file tree

Hide file tree

Showing 9 changed files with 729 additions and 708 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "scheb/2fa-bundle": "^6.0",
         "scheb/2fa-email": "^6.0",
         "scheb/2fa-trusted-device": "^6.0",
-        "sulu/sulu": "~2.5.0@dev",
+        "sulu/sulu": "~2.5.0",
         "symfony/config": "^6.0",
         "symfony/dotenv": "^6.0",
         "symfony/flex": "^1.17 || ^2.0",

diff --git a/...sulu.18b81b6bc6a79a5480cb94ef41a6c264.svg → ...sulu.0a81d32d65c76800caef704f889a263f.svg b/...sulu.18b81b6bc6a79a5480cb94ef41a6c264.svg → ...sulu.0a81d32d65c76800caef704f889a263f.svg
diff --git a/...sulu.e0827742615cde3a7c0477217fcd5821.ttf → ...ulu.c164c4922c6aad67724e0e322a7921bf.woff b/...sulu.e0827742615cde3a7c0477217fcd5821.ttf → ...ulu.c164c4922c6aad67724e0e322a7921bf.woff
diff --git a/...ulu.169d5578e34ddf5c1d35a6ca91c74e7c.woff → ...sulu.cf0d2bf9640231f4a1daccadd6200344.ttf b/...ulu.169d5578e34ddf5c1d35a6ca91c74e7c.woff → ...sulu.cf0d2bf9640231f4a1daccadd6200344.ttf
diff --git a/public/build/admin/main.7190bb907e5b5dab9b6e.css b/public/build/admin/main.7190bb907e5b5dab9b6e.css
diff --git a/.../build/admin/main.ba81c95860982212e075.js → .../build/admin/main.7190bb907e5b5dab9b6e.js b/.../build/admin/main.ba81c95860982212e075.js → .../build/admin/main.7190bb907e5b5dab9b6e.js
diff --git a/...ld/admin/main.ba81c95860982212e075.js.map → ...ld/admin/main.7190bb907e5b5dab9b6e.js.map b/...ld/admin/main.ba81c95860982212e075.js.map → ...ld/admin/main.7190bb907e5b5dab9b6e.js.map
diff --git a/public/build/admin/main.ba81c95860982212e075.css b/public/build/admin/main.ba81c95860982212e075.css
diff --git a/public/build/admin/manifest.json b/public/build/admin/manifest.json
@@ -1,7 +1,7 @@
 {
-  "main.css": "/build/admin/main.ba81c95860982212e075.css",
-  "main.js": "/build/admin/main.ba81c95860982212e075.js",
-  "main.js.map": "/build/admin/main.ba81c95860982212e075.js.map",
+  "main.css": "/build/admin/main.7190bb907e5b5dab9b6e.css",
+  "main.js": "/build/admin/main.7190bb907e5b5dab9b6e.js",
+  "main.js.map": "/build/admin/main.7190bb907e5b5dab9b6e.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.woff?uud37h": "/build/admin/fonts/sulu.169d5578e34ddf5c1d35a6ca91c74e7c.woff",
-  "build/admin/fonts/sulu.svg?uud37h": "/build/admin/fonts/sulu.18b81b6bc6a79a5480cb94ef41a6c264.svg",
-  "build/admin/fonts/sulu.ttf?uud37h": "/build/admin/fonts/sulu.e0827742615cde3a7c0477217fcd5821.ttf",
+  "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/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",