Zhicheng Wang 752a152731 Merge remote-tracking branch 'origin/master'
upgrade.jade的附录没有翻译

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/index.jade
2016-05-30 21:46:16 +08:00
..
2016-05-28 22:23:34 +01:00
2016-04-23 22:16:28 +08:00
2016-05-29 22:46:41 +08:00