jitendra 6384b84746 Resolve conflicts		2019-09-11 13:16:37 +05:30
..
API	Removed configurable checks and deleted unwanted files	2019-09-04 16:23:05 +05:30
Admin	Resolve conflicts	2019-09-11 13:16:37 +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	Fixed exchange rate exception	2019-09-06 15:48:59 +05:30
Customer	Resolve conflicts	2019-09-11 13:16:37 +05:30
Discount	Resolve conflicts	2019-09-11 13:16:37 +05:30
Inventory	Group product added	2019-08-19 15:00:24 +05:30
Payment	Reverting to original settings	2019-09-03 12:36:57 +05:30
Paypal/src	Merged with master	2019-09-09 14:46:43 +05:30
Product	Resolve conflicts	2019-09-11 13:16:37 +05:30
Sales	Conflicts resolved	2019-09-10 12:29:19 +05:30
Shipping	Merge with master	2019-09-04 15:05:03 +05:30
Shop	Resolve conflicts	2019-09-11 13:16:37 +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	Resolve conflicts	2019-09-11 13:16:37 +05:30
User	Resolved conflicts	2019-08-19 16:01:38 +05:30