Merge branch '2.2' of github.com:sulu/skeleton into 2.3

Conflicts: composer.json public/build/admin/main.766d3604dac285a343e9.js.map public/build/admin/main.84a9d330e6906f8db811.css public/build/admin/main.84a9d330e6906f8db811.js public/build/admin/main.84a9d330e6906f8db811.js.map public/build/admin/main.e0428cae22628849f6bd.js.map public/build/admin/manifest.json
sulu · Oct 6, 2021 · 807164a · 807164a
2 parents 71ba650 + 0c9bbae
commit 807164a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "friendsofsymfony/http-cache-bundle": "^2.8",
         "handcraftedinthealps/zendsearch": "^2.0",
         "jackalope/jackalope-doctrine-dbal": "^1.3",
-        "sulu/sulu": "~2.3.5",
+        "sulu/sulu": "~2.3.6",
         "symfony/config": "^5.1",
         "symfony/dotenv": "^5.1",
         "symfony/flex": "^1.2",

diff --git a/...build/admin/main.e0428cae22628849f6bd.css → ...build/admin/main.0258869a5cb4dc9295c3.css b/...build/admin/main.e0428cae22628849f6bd.css → ...build/admin/main.0258869a5cb4dc9295c3.css
diff --git a/.../build/admin/main.e0428cae22628849f6bd.js → .../build/admin/main.0258869a5cb4dc9295c3.js b/.../build/admin/main.e0428cae22628849f6bd.js → .../build/admin/main.0258869a5cb4dc9295c3.js
diff --git a/...ld/admin/main.e0428cae22628849f6bd.js.map → ...ld/admin/main.0258869a5cb4dc9295c3.js.map b/...ld/admin/main.e0428cae22628849f6bd.js.map → ...ld/admin/main.0258869a5cb4dc9295c3.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.e0428cae22628849f6bd.css",
-  "main.js": "/build/admin/main.e0428cae22628849f6bd.js",
-  "main.js.map": "/build/admin/main.e0428cae22628849f6bd.js.map",
+  "main.css": "/build/admin/main.0258869a5cb4dc9295c3.css",
+  "main.js": "/build/admin/main.0258869a5cb4dc9295c3.js",
+  "main.js.map": "/build/admin/main.0258869a5cb4dc9295c3.js.map",
   "build/admin/fonts/fontawesome-webfont.ttf?v=4.7.0": "/build/admin/fonts/fontawesome-webfont.1e59d2330b4c6deb84b340635ed36249.ttf",
   "build/admin/fonts/fontawesome-webfont.woff2?v=4.7.0": "/build/admin/fonts/fontawesome-webfont.20fd1704ea223900efa9fd4e869efb08.woff2",
   "build/admin/fonts/fontawesome-webfont.eot?v=4.7.0": "/build/admin/fonts/fontawesome-webfont.8b43027f47b20503057dfbbaa9401fef.eot",