Zhimin YE 4578087fa5 Merge remote-tracking branch 'remotes/angular.io/master' ... # Conflicts: # README.md # harp.json # public/_includes/_hero-home.jade # public/docs/_examples/quickstart/ts/systemjs.config.1.js # public/docs/dart/latest/_util-fns.jade # public/docs/dart/latest/api/_data.json # public/docs/dart/latest/api/index.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/cookbook/aot-compiler.jade # public/docs/ts/latest/cookbook/component-communication.jade # public/docs/ts/latest/cookbook/visual-studio-2015.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/animations.jade # public/docs/ts/latest/guide/change-log.jade # public/docs/ts/latest/guide/npm-packages.jade # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/security.jade # public/docs/ts/latest/guide/server-communication.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/guide/testing.jade # public/docs/ts/latest/guide/typescript-configuration.jade # public/docs/ts/latest/guide/upgrade.jade # public/docs/ts/latest/guide/webpack.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt3.jade # public/docs/ts/latest/tutorial/toh-pt5.jade Server Communication and Visual studio 2015 require further merging.		2016-11-03 15:38:23 +00:00
..
_includes	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
about	remove 一个	2016-09-25 19:58:46 +01:00
cardboard	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
docs	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
resources	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
search	Upgrade swiftype to 2.0 library and added a results page for searches	2016-10-12 10:01:19 -07:00
translate/cn	fix: about	2016-10-20 15:28:48 +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	chore: define alt ng2 layout for top-level pages (#2686)	2016-10-28 01:08:53 +01:00
contribute.jade	remove 一个	2016-09-25 19:58:46 +01:00
events.jade	news(oct30): October 30 updates to news and events	2016-10-31 00:49:53 -07:00
favicon.ico	Add favicon.ico to the top level of the site	2015-03-03 04:32:05 -08:00
features.jade	fix： change all 他 > 它	2016-09-25 19:50:45 +01:00
google5a670c2e11d1d2f6.html	chore(verification): verify domain ownership for google	2016-01-26 15:15:21 -08:00
googleb96cceae5888d79f.html	chore(webmaster): update webmaster tools key	2015-12-15 10:21:17 -08:00
index.jade	design(style): Restyle changes from Alex	2016-09-14 17:18:55 -07:00
license	chore: add gulp link-checker task	2016-03-10 23:53:43 -08:00
license.txt	chore(routing): host the license file on angular.io	2016-01-08 15:14:20 -08:00
news.jade	news(oct30): October 30 updates to news and events	2016-10-31 00:49:53 -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	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00