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
..
_data.json	Merge remote-tracking branch 'remotes/angular.io/master'	2016-10-17 22:48:18 +01:00
a1-a2-quick-reference.jade	fix: a1-a2-quick-ref	2016-10-18 17:01:27 +01:00
aot-compiler.jade	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
component-communication.jade	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
component-relative-paths.jade	更正individual的翻译	2016-10-06 20:48:24 +08:00
dependency-injection.jade	lazy-loading统一翻译为惰性加载	2016-10-11 16:26:41 +08:00
dynamic-form.jade	更正individual的翻译	2016-10-06 20:48:24 +08:00
form-validation.jade	translate: form-validation, done.	2016-10-19 20:52:28 +01:00
i18n.jade	translate: i18n done.	2016-10-20 10:59:05 +01:00
index.jade	Merge remote-tracking branch 'remotes/angular.io/master'	2016-09-23 22:13:02 +01:00
ngmodule-faq.jade	fix: ngmodule-faq	2016-10-18 22:16:04 +01:00
set-document-title.jade	patch： ts-to-js, component-communication, set-document-title and visual-studio.	2016-10-18 19:53:12 +01:00
ts-to-js.jade	docs: use Jade include rather than Harp partial (#2392)	2016-09-19 20:08:03 -07:00
visual-studio-2015.jade	docs(vs2015): update for current tools. (#2672)	2016-10-26 09:26:40 -07:00