Conflicts: composer.lock packages/Webkul/Admin/src/Resources/lang/ben/app.php packages/Webkul/Admin/src/Resources/lang/ru/app.php packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php packages/Webkul/Core/src/Core.php packages/Webkul/Customer/src/Http/Controllers/CustomerController.php packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php packages/Webkul/Product/src/Helpers/AbstractProduct.php packages/Webkul/Product/src/Helpers/Toolbar.php packages/Webkul/Product/src/Models/ProductFlat.php packages/Webkul/Shipping/src/Config/system.php packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php packages/Webkul/Tax/src/Http/Controllers/TaxController.php packages/Webkul/Ui/src/Resources/lang/ben/app.php |
||
|---|---|---|
| .. | ||
| factories | ||
| migrations | ||
| seeders | ||
| .gitignore | ||