angular-cn

History

Zhicheng Wang d034bc33c8 Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade

2016-08-06 19:52:08 +08: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

Fix: #42 ES2105 -> ES2015

2016-07-28 09:07:52 +01:00

toh-pt2.jade

把“作用范围”批量改为“作用域”