Zhicheng Wang 3d40a26655 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/quickstart.jade

2016-09-11 21:20:58 +08:00

..

api

完成了导航菜单

2016-04-13 08:53:17 +08:00

cookbook

对上次的合并查漏补缺

2016-09-10 18:31:38 +08:00

guide

Merge remote-tracking branch 'origin/master'

2016-09-11 21:20:58 +08:00

testing

校对合并结果

2016-07-16 17:47:55 +08:00

tutorial

更正中文社区的阿泽指出的错误

2016-09-11 09:35:54 +08:00

_data.json

chore(cheatsheet): fix double banner issue (#2293)

2016-09-08 15:01:39 -07:00

_quickstart_repo.jade

把QuickStart改成“快速起步”

2016-05-18 13:30:07 +08:00

_util-fns.jade

docs: revert Jade to markdown

2016-07-05 23:03:30 -07:00

cheatsheet.jade

chore(cheatsheet): fix double banner issue (#2293)

2016-09-08 15:01:39 -07:00

cli-quickstart.jade

docs: update node and npm version recommendations

2016-07-05 23:09:37 -07:00

glossary.jade

Merge remote-tracking branch 'origin/master'

2016-09-11 21:20:58 +08:00

help-new.jade

完成了导航菜单

2016-04-13 08:53:17 +08:00

help.jade

improved infrastructure for devguide and revised getting started (TS)

2015-09-10 13:32:57 -07:00

index.jade

Merge remote-tracking branch 'origin/master'

2016-09-08 17:20:01 +08:00

quickstart.jade

Merge remote-tracking branch 'origin/master'

2016-09-11 21:20:58 +08:00

resources.jade

开发指南-组件样式 翻译了一半儿

2016-05-20 17:53:30 +08:00

styleguide.jade

docs: temporary TS-referencing chapters for gaps in JS/Dart

2016-03-01 11:22:04 -08:00