rexebin ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master' ... # Conflicts: # harp.json # public/_includes/_hero-home.jade # public/_includes/_scripts-include.jade # public/docs/_examples/quickstart/js/package.1.json # public/docs/_includes/_side-nav.jade # public/docs/js/latest/cookbook/ts-to-js.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/api/_data.json # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/cookbook/aot-compiler.jade # public/docs/ts/latest/cookbook/ngmodule-faq.jade # public/docs/ts/latest/cookbook/rc4-to-rc5.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/attribute-directives.jade # public/docs/ts/latest/guide/browser-support.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/lifecycle-hooks.jade # public/docs/ts/latest/guide/ngmodule.jade # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/style-guide.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/guide/testing.jade # public/docs/ts/latest/guide/upgrade.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/_data.json # public/docs/ts/latest/tutorial/toh-pt5.jade # public/docs/ts/latest/tutorial/toh-pt6.jade		2016-10-17 22:48:18 +01:00
..
_alerts.jade	remove 一个	2016-09-25 19:58:46 +01:00
_aside.jade	docs: fix numerous typos in many doc files.	2016-06-01 01:08:56 -07:00
_callouts.jade	callouts added	2015-04-07 20:38:52 -07:00
_code-examples.jade	chore: more "angular2" to "angular" cleanup (#2417)	2016-09-20 11:37:16 +02:00
_images.jade	style(images): add image best practices to styleguide doc	2016-06-16 16:06:13 -07:00
_jump-nav.jade	aside added	2015-04-07 05:35:19 -07:00
_layouts.jade	docs: fix numerous typos in many doc files.	2016-06-01 01:08:56 -07:00
_styleguide.jade	chore: add the styleguide back (#2557)	2016-10-06 17:40:01 -04:00
_tables.jade	docs: fix numerous typos in many doc files.	2016-06-01 01:08:56 -07:00