Jitendra Singh 45ec4532fa Resolved conflicts		2020-03-03 15:59:47 +05:30
..
publishable/assets	initial for guest customer wishlist	2020-03-03 11:53:11 +05:30
src	Resolved conflicts	2020-03-03 15:59:47 +05:30
.gitignore	bagisto velocity theme updates	2020-01-26 14:17:05 +05:30
composer.json	bagisto velocity theme updates	2020-01-26 14:17:05 +05:30
package.json	view order page updates	2020-01-27 19:49:02 +05:30
webpack.mix.js	#2274, #2275 resolved	2020-02-06 11:47:02 +05:30