prashant-webkul 3c8807e7e9 merge conflicts removed		2018-12-18 18:17:01 +05:30
..
API	review apis	2018-11-26 10:26:59 +05:30
Admin	merge conflicts removed	2018-12-18 18:17:01 +05:30
Attribute	Fixed issues 314 and 315	2018-12-13 18:51:54 +05:30
Category	Merge branch 'master' of https://github.com/bagisto/bagisto into prashant	2018-11-30 20:38:15 +05:30
Checkout	minor fixes in the merge cart function of cart	2018-12-03 18:37:29 +05:30
Core	merge conflicts removed	2018-12-18 18:17:01 +05:30
Customer	merge conflicts removed	2018-12-18 18:17:01 +05:30
Inventory	Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165	2018-12-06 17:29:26 +05:30
Payment	shipping & payment methods	2018-12-14 11:56:52 +05:30
Paypal/src	Typo fixed in ipn helper	2018-11-16 16:47:11 +05:30
Product	merge conflicts removed	2018-12-18 18:17:01 +05:30
Sales	Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165	2018-12-06 17:29:26 +05:30
Shipping	Refactor Menu system and core config data system	2018-12-13 16:28:28 +05:30
Shop	merge conflicts removed	2018-12-18 18:17:01 +05:30
Tax	Update TaxCategoryController.php	2018-12-01 10:48:19 +03:30
Theme	View Render Event system implemented	2018-12-04 16:35:30 +05:30
Ui	merge conflicts removed	2018-12-18 18:17:01 +05:30
User	Bugs and issues resolvements	2018-12-18 16:14:21 +05:30