Merge branch 'master' into seasoft-css-admin

EC-CUBE · Dec 20, 2024 · 96ed21a · 96ed21a
2 parents b0b337b + 110f5ca
commit 96ed21a
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 1,879 deletions.
diff --git a/composer.json b/composer.json
@@ -41,6 +41,8 @@
         "nanasess/php8-compat": "^1.0",
         "pear/archive_tar": "^1.4.3",
         "pear/mail": "*",
+        "pear/net_smtp": "^1.12",
+        "pear/net_socket": "^1.2",
         "pear/pear-core-minimal": "^1.10",
         "pear/xml_parser": "*",
         "pear/xml_serializer": "*",

diff --git a/composer.lock b/composer.lock