Merge branch 'EC-CUBE:4.3' into customize-bundle

EC-CUBE · May 20, 2024 · ff94052 · ff94052
2 parents 6fad8c4 + 4db7ae7
commit ff94052
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 49 deletions.
diff --git a/composer.json b/composer.json
@@ -102,7 +102,7 @@
         "twig/extra-bundle": "^3.3",
         "twig/intl-extra": "^3.3",
         "twig/twig": "^3.8",
-        "vlucas/phpdotenv": "v5.4"
+        "vlucas/phpdotenv": "v5.6.0"
     },
     "require-dev": {
         "captbaritone/mailcatcher-codeception-module": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "filepond-plugin-file-validate-type": "^1.2.8",
     "filepond-plugin-image-preview": "^4.6.12",
     "jquery": "^3.7.1",
-    "jquery-ui": "^1.13.2",
+    "jquery-ui": "^1.13.3",
     "jquery.qrcode": "^1.0.3",
     "ladda": "^2.0.3",
     "slick-carousel": "^1.8.1",