Shubham Mehrotra 10c39a8de2 resolved conflicts		2020-03-24 16:45:56 +05:30
..
publishable/assets	resolved conflicts	2020-03-24 16:45:56 +05:30
src	resolved conflicts	2020-03-24 16:45:56 +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