rahul shukla 0b7a2f8588 resolve conflict		2020-02-05 16:10:30 +05:30
..
css	resolve conflict	2020-02-05 16:10:30 +05:30
fonts	bagisto velocity theme updates	2020-01-26 14:17:05 +05:30
images	bagisto velocity theme updates	2020-01-26 14:17:05 +05:30
js	resolve conflict	2020-02-05 16:10:30 +05:30
material-icons/iconfont	bagisto velocity theme updates	2020-01-26 14:17:05 +05:30
mix-manifest.json	resolve conflict	2020-02-05 16:10:30 +05:30