• lixy's avatar
    Merge branch 'devModify' · f5fb06d4
    lixy authored
    # Conflicts:
    #	components/footer.vue
    #	components/menu.vue
    #	nuxt.config.js
    #	pages/tour.vue
    f5fb06d4
nuxt.config.js 3.05 KB