Shubham Mehrotra 35b5f3da8d resolved conflicts		2020-06-24 17:42:30 +05:30
..
publishable/assets	#3309	2020-06-24 15:17:04 +05:30
src	resolved conflicts	2020-06-24 17:42:30 +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	Fixed validation issue	2020-03-24 19:59:06 +05:30
webpack.mix.js	Revert "Upgraded velocity theme npm dependencies"	2020-03-24 19:23:01 +05:30