• lixy's avatar
    Merge branch 'devModify' · f5fb06d4
    lixy authored
    # Conflicts:
    #	components/footer.vue
    #	components/menu.vue
    #	nuxt.config.js
    #	pages/tour.vue
    f5fb06d4
Name
Last commit
Last update
.nuxt Loading commit data...
assets Loading commit data...
components Loading commit data...
layouts Loading commit data...
middleware Loading commit data...
pages Loading commit data...
plugins Loading commit data...
server Loading commit data...
static Loading commit data...
store Loading commit data...
.editorconfig Loading commit data...
.eslintrc.js Loading commit data...
.gitignore Loading commit data...
README.md Loading commit data...
env.js Loading commit data...
nuxt.config.js Loading commit data...
package-lock.json Loading commit data...
package.json Loading commit data...