rexebin a59b1b60ee Merge remote-tracking branch 'remotes/angular.io/master' ...

# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/testing.jade

2016-09-23 23:22:42 +01:00

..

api

完成了导航菜单

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

cookbook

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 23:22:42 +01:00

guide

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 23:22:42 +01:00

tutorial

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 22:13:02 +01:00

_data.json

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 22:13:02 +01: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

更新了小抄

2016-09-18 11:14:15 +08: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 'remotes/angular.io/master'

2016-09-23 22:13:02 +01:00

help-new.jade

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 22:13:02 +01:00

help.jade

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00

index.jade

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 22:13:02 +01:00

quickstart.jade

Merge remote-tracking branch 'remotes/angular.io/master'

2016-09-23 22:13:02 +01:00

resources.jade

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

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

styleguide.jade

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00