2a7cef9c by jikai

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/Home.vue
2 parents f35b59a5 0da45e6b