* 'master' of http://gitlab.5jstore.com/zhouchengbo/text2video-frontend:
  update
  update

# Conflicts:
#	src/views/home/index.vue