Merge branch 'feature_optimize_order_create_refund' into test
# Conflicts: # application/modules/Marketing/controllers/Marketing.php # vendor/autoload.php # vendor/composer/autoload_real.php # vendor/composer/autoload_static.php # vendor/composer/installed.json
Showing
... | ... | @@ -6,8 +6,8 @@ |
"require": { | ||
"php": "7.2.*", | ||
"ext-json": "*", | ||
"api/php_services":"1.0.15", | ||
"api/php_utils":"1.0.17", | ||
"api/php_services":"1.0.14", | ||
"ext-openssl": "*" | ||
}, | ||
"minimum-stability": "dev", | ||
... | ... |
Please register or sign in to comment