Merge remote-tracking branch 'en/master'

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
This commit is contained in:
Zhicheng Wang 2017-06-01 21:11:32 +08:00
commit 53e50f64cf
1 changed files with 0 additions and 5 deletions

View File

@ -201,9 +201,4 @@
"title": "Webpack 简介", "title": "Webpack 简介",
"intro": "使用基于 Webpack 的工具创建 Angular 应用" "intro": "使用基于 Webpack 的工具创建 Angular 应用"
}, },
"universal": {
"title": "Angular统一平台Universal",
"intro": "如何使用Angular统一平台"
}
} }