Jitendra Singh 3c9ef6ee45 Merge pull request #1558 from marcmascarell/patch-1 ... Spanish translation for Shop module		2019-10-10 11:06:21 +05:30
..
API	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Admin	Updated refund with new product types	2019-10-09 19:59:53 +05:30
Attribute	Merge with master	2019-09-04 15:05:03 +05:30
CMS	CMS pages seeder implemented and now seeder generates all prebuilt pages that were listed in footer quicklinks	2019-08-24 15:57:09 +05:30
Category	Merged with master	2019-09-09 14:46:43 +05:30
Checkout	Resolve conflicts	2019-09-11 13:16:37 +05:30
Core	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Customer	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Discount	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Inventory	Group product added	2019-08-19 15:00:24 +05:30
Payment	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Paypal/src	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Product	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Sales	Updated refund with new product types	2019-10-09 19:59:53 +05:30
Shipping	Resoloved conflicts	2019-10-09 17:12:57 +05:30
Shop	Merge pull request #1558 from marcmascarell/patch-1	2019-10-10 11:06:21 +05:30
Tax	Group product added	2019-08-19 15:00:24 +05:30
Theme	Resolved conflicts	2019-08-19 16:01:38 +05:30
Ui	Merged with master	2019-09-11 15:23:57 +05:30
User	Resolved conflicts	2019-08-19 16:01:38 +05:30