Commits
pkarwatka committed 41435c98a85M
Merge branch 'master' of https://github.com/pkarw/vue-storefront # Conflicts: # src/components/core/blocks/Microcart/Microcart.vue # src/pages/Category.vue
Merge branch 'master' of https://github.com/pkarw/vue-storefront # Conflicts: # src/components/core/blocks/Microcart/Microcart.vue # src/pages/Category.vue