Merge branch 'dev' into 'feature/UI-vuetify'
# Conflicts: # pages/login.vue
Showing
... | @@ -23,6 +23,7 @@ | ... | @@ -23,6 +23,7 @@ |
"vue": "^2.7.10", | "vue": "^2.7.10", | ||
"vue-server-renderer": "^2.7.10", | "vue-server-renderer": "^2.7.10", | ||
"vue-template-compiler": "^2.7.10", | "vue-template-compiler": "^2.7.10", | ||
"vuelidate": "^0.7.7", | |||
"vuetify": "^2.6.10" | "vuetify": "^2.6.10" | ||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
... | ... |
Please register or sign in to comment