elektronika_bagisto/packages/Webkul
merdan c40eb25137 Merge branch 'master' of https://github.com/bagisto/bagisto into balance
 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
2022-12-15 16:39:57 +05:00
..
API/Http server-ownership-cahnged 2022-05-13 15:54:41 +05:00
Admin Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Attribute Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
BookingProduct Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
CMS Optimized code 2022-09-26 13:34:09 +05:30
CartRule Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
CatalogRule Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Category Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Checkout Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Core Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Customer Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
DebugBar/src Convert if else statement to PSR-2 standard 2022-07-12 17:34:13 +05:30
Inventory Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Marketing/src Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Marketplace marketplace removed 2022-01-24 13:57:11 +05:00
Notification/src Refactorred Notification package 2022-09-23 13:48:36 +05:30
Payment Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Paypal Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Product Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Rule Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Sales Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Shipping Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Shop Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Sitemap/src Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
SocialLogin Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Tax Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Theme Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Ui Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
User Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00
Velocity Merge branch 'master' of https://github.com/bagisto/bagisto into balance 2022-12-15 16:39:57 +05:00