angular-cn

History

Zhimin YE (Rex) 654030f09d Merge remote-tracking branch 'remotes/angular.io/master'

# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade

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

_data.json

Add some blank lines, to avoid unnecessary conflicts on merging.

2016-06-15 23:31:28 +08:00

index.jade

Merge remote-tracking branch 'origin/master'

2016-07-07 08:15:51 +08:00

toh-pt1.jade

(review:) Quick starter and TOH, patch up new paragraphs and mis-alignments.

2016-08-16 10:16:31 +01:00

toh-pt2.jade

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