rahul shukla 0b7a2f8588 resolve conflict		2020-02-05 16:10:30 +05:30
..
publishable/assets	resolve conflict	2020-02-05 16:10:30 +05:30
src	Merge pull request #2244 from shubhwebkul/velocity-updated	2020-02-05 16:06:52 +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	bagisto velocity theme updates	2020-01-26 14:17:05 +05:30