merdan b6c46480aa Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 ... Conflicts: composer.lock		2022-03-25 16:18:54 +05:00
..
Admin	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-03-25 16:18:54 +05:00
Attribute	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-03-25 16:18:54 +05:00
BookingProduct	Merge with master	2022-03-24 12:51:07 +05:30
CMS	Merge with master	2022-03-24 12:51:07 +05:30
CartRule	Merge with master	2022-03-24 12:51:07 +05:30
CatalogRule	Merge with master	2022-03-24 12:51:07 +05:30
Category	Merge with master	2022-03-24 12:51:07 +05:30
Checkout	Merge with master	2022-03-24 12:51:07 +05:30
Core	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-03-25 16:18:54 +05:00
Customer	Merge with master	2022-03-24 12:51:07 +05:30
DebugBar/src	Merge with master	2022-03-24 12:51:07 +05:30
Inventory	Merge with master	2022-03-24 12:51:07 +05:30
Marketing/src	Merge with master	2022-03-24 12:51:07 +05:30
Marketplace	variants	2022-02-07 17:51:15 +05:00
Notification/src	Merge with master	2022-03-24 12:51:07 +05:30
Payment	Merge with master	2022-03-24 12:51:07 +05:30
Paypal	Merge with master	2022-03-24 12:51:07 +05:30
Product	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-03-25 16:18:54 +05:00
Rule	Merge with master	2022-03-24 12:51:07 +05:30
Sales	Merge with master	2022-03-24 12:51:07 +05:30
Shipping	Merge with master	2022-03-24 12:51:07 +05:30
Shop	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-03-25 16:18:54 +05:00
SocialLogin	Merge with master	2022-03-24 12:51:07 +05:30
Tax	Merge with master	2022-03-24 12:51:07 +05:30
Theme	Merge with master	2022-03-24 12:51:07 +05:30
Ui	Issue #6132 fixed	2022-03-25 16:03:21 +05:30
User	Merge with master	2022-03-24 12:51:07 +05:30
Velocity	Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1	2022-03-25 16:18:54 +05:00