Commit bbc8907e6fd6aeb0ce3bcf101ca5e1c9605d874f

Authored by yanghl
2 parents f791910a 60e515f3

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skills/plan/project-init/templates/docs-04-stack-template.md