Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master' ... # Conflicts: # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/displaying-data.jade # public/docs/ts/latest/guide/index.jade # public/docs/ts/latest/guide/lifecycle-hooks.jade # public/docs/ts/latest/guide/testing.jade # public/docs/ts/latest/tutorial/toh-pt5.jade		2016-09-26 15:14:39 +01:00
..
_includes	Merge remote-tracking branch 'remotes/angular.io/master'	2016-09-23 23:22:42 +01:00
about	remove 一个	2016-09-25 19:58:46 +01:00
cardboard	…
docs	Merge remote-tracking branch 'remotes/angular.io/master'	2016-09-26 15:14:39 +01:00
resources	Merge remote-tracking branch 'remotes/angular.io/master'	2016-09-26 15:14:39 +01:00
translate/cn	fix： change all 他 > 它	2016-09-25 19:50:45 +01:00
404.jade	微调	2016-06-02 15:17:55 +08:00
_data.json	design(style): Restyle changes from Alex	2016-09-14 17:18:55 -07:00
_layout.jade	…
contribute.jade	remove 一个	2016-09-25 19:58:46 +01:00
events.jade	events(aug9): Add anglebrackets	2016-08-09 13:06:00 -07:00
favicon.ico	…
features.jade	fix： change all 他 > 它	2016-09-25 19:50:45 +01:00
google5a670c2e11d1d2f6.html	…
googleb96cceae5888d79f.html	…
index.jade	design(style): Restyle changes from Alex	2016-09-14 17:18:55 -07:00
license	…
license.txt	…
news.jade	chore: rename Angular 2 to simply Angular (#2402)	2016-09-19 20:24:40 -07:00
presskit.jade	minor adjustment to index and presskit.	2016-05-25 13:47:55 +01:00
support.jade	Merge remote-tracking branch 'remotes/angular.io/master'	2016-09-23 22:13:02 +01:00
survey.html	…