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

# Conflicts:
#	public/docs/_examples/quickstart/ts/package.1.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade

2016-10-02 10:39:25 +08:00

..

_data.json

docs(i18n): add internationalization (i18n) guide (#2491)

2016-09-29 11:15:55 -07:00

AngularCheatSheet_Letter.pdf

docs(cheatsheet): update for alpha-44

2015-10-20 01:26:36 +01:00

AngularCheatSheet_Poster.pdf

docs(cheatsheet): update for alpha-44

2015-10-20 01:26:36 +01:00

animations.jade

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

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

architecture.jade

Merge remote-tracking branch 'origin/master'

2016-10-02 10:39:25 +08:00

attribute-directives.jade

改正错误

2016-09-27 10:15:33 +08:00

browser-support.jade

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

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

cheatsheet-cn.json

更新了小抄

2016-09-18 11:14:15 +08:00

cheatsheet.jade

chore(cheatsheet): use Jade to generate mirror page (#2289)

2016-09-08 13:37:22 -07:00

component-styles.jade

fix： change all 他 > 它

2016-09-25 19:50:45 +01:00

dependency-injection.jade

fix： change all 他 > 它

2016-09-25 19:50:45 +01:00

displaying-data.jade

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

2016-09-26 15:14:39 +01:00

forms.jade

Merge remote-tracking branch 'origin/master'

2016-10-02 10:39:25 +08:00

glossary.jade

docs(glossary): general cleanup and fix links (#2100)

2016-08-17 17:50:42 -07:00

hierarchical-dependency-injection.jade

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

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

index.jade

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

2016-09-26 15:14:39 +01:00

lifecycle-hooks.jade

fix: lifecycle-hooks.jade.

2016-09-26 15:56:44 +01:00

ngmodule.jade

微调，增补了社区贡献者

2016-09-26 20:44:35 +08:00

npm-packages.jade

把angular2-in-memory-web-api改名为angular-in-memory-web-api

2016-09-30 21:38:44 +08:00

pipes.jade

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

2016-09-26 15:14:39 +01:00

router.jade

Update router.jade

2016-09-27 16:25:02 +08:00

security.jade

fix： change all 他 > 它

2016-09-25 19:50:45 +01:00

server-communication.jade

把angular2-in-memory-web-api改名为angular-in-memory-web-api

2016-09-30 21:38:44 +08:00

structural-directives.jade

改正错误

2016-09-27 10:15:33 +08:00

style-guide.jade

Merge remote-tracking branch 'origin/master'

2016-10-02 10:39:25 +08:00

template-syntax.jade

fix： change all 他 > 它

2016-09-25 19:50:45 +01:00

testing.jade

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

2016-09-26 15:14:39 +01:00

typescript-configuration.jade

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

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

upgrade.jade

Merge remote-tracking branch 'origin/master'

2016-10-02 10:39:25 +08:00

user-input.jade

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

2016-08-23 14:02:54 +01:00

webpack.jade

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

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