Skip to content
Snippets Groups Projects
Commit b4d4d5aa authored by Zara Mudassar's avatar Zara Mudassar
Browse files

Merge remote-tracking branch 'origin/remove-vuetify' into item-card 

# Conflicts:
#	src/components/LoginForm.vue
#	src/router/index.js
parents 46062a8a a97976e2
No related branches found
No related tags found
3 merge requests!19Item card,!17Item card,!6Login form
Pipeline #174873 passed
Stage: build
Stage: test
Stage: deploy