# Conflicts:
#   pages/login.vue
#   plugins/axios.js

update navbar ui

See merge request !17

Feature/update product ui

See merge request !16

Merge branch 'feature/UI-vuetify' of https://gitlab.kiaisoft.com/kiaisoft.anh.tran2/kiaisoft_tuananh_nuxt into feature/update-product-UI

Merge branch 'feature/UI-vuetify' of https://gitlab.kiaisoft.com/kiaisoft.anh.tran2/kiaisoft_tuananh_nuxt into feature/UI-vuetify

Hotfix/axios api

See merge request !15

Merge branch 'dev' of https://gitlab.kiaisoft.com/kiaisoft.anh.tran2/kiaisoft_tuananh_nuxt into feature/update-product-UI

# Conflicts:
#   pages/login.vue

Feature/category ui

See merge request !12

# Conflicts:
#   layouts/admin.vue
#   pages/categories/index.vue
#   pages/posts/index.vue
#   pages/products/index.vue
#   pages/users/index.vue