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

sulu · Feb 4, 2021 · 1fb541e · 1fb541e
2 parents 1e5bd4b + aaea346
commit 1fb541e
Show file tree

Hide file tree

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

diff --git a/public/build/admin/main.132b840bc0d80463ec70.css b/public/build/admin/main.132b840bc0d80463ec70.css
diff --git a/public/build/admin/main.9f0e245e784ec46e1536.css b/public/build/admin/main.9f0e245e784ec46e1536.css
diff --git a/.../build/admin/main.132b840bc0d80463ec70.js → .../build/admin/main.9f0e245e784ec46e1536.js b/.../build/admin/main.132b840bc0d80463ec70.js → .../build/admin/main.9f0e245e784ec46e1536.js
diff --git a/...ld/admin/main.132b840bc0d80463ec70.js.map → ...ld/admin/main.9f0e245e784ec46e1536.js.map b/...ld/admin/main.132b840bc0d80463ec70.js.map → ...ld/admin/main.9f0e245e784ec46e1536.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.132b840bc0d80463ec70.css",
-  "main.js": "build/admin/main.132b840bc0d80463ec70.js",
-  "main.js.map": "build/admin/main.132b840bc0d80463ec70.js.map",
+  "main.css": "build/admin/main.9f0e245e784ec46e1536.css",
+  "main.js": "build/admin/main.9f0e245e784ec46e1536.js",
+  "main.js.map": "build/admin/main.9f0e245e784ec46e1536.js.map",
   "/build/admin/fonts/font-awesome.min.css": "/build/admin/fonts/fontawesome-webfont.f691f37e57f04c152e2315ab7dbad881.woff",
   "/build/admin/fonts/global.scss": "/build/admin/fonts/open-sans-v15-latin-regular.ec806460121999bcfb12bc264d46d41e.woff2",
   "/build/admin/fonts/sulu-icon.css": "/build/admin/fonts/sulu.7918956d252a916c3102478369c134b8.ttf",