xt / xcx-book · Commits

# Conflicts:
#	pages/book/b_addnew.js

# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json

# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json

# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json

# Conflicts:
#	pages/book/b_addnew.js