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
..
api	api(cleanup): Remove preview from the API reference banner	2016-10-07 14:32:48 -07:00
cookbook	patch： ts-to-js, component-communication, set-document-title and visual-studio.	2016-10-18 19:53:12 +01:00
guide	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
tutorial	docs: use Jade include rather than Harp partial (#2392)	2016-09-19 20:08:03 -07:00
_data.json	Merge remote-tracking branch 'remotes/angular.io/master'	2016-11-03 15:38:23 +00:00
_util-fns.jade	improved infrastructure for devguide and revised getting started (TS)	2015-09-10 13:32:57 -07:00
cheatsheet.jade	chore(cheatsheet): fix double banner issue (#2293)	2016-09-08 15:01:39 -07:00
glossary.jade	docs(glossary): general cleanup and fix links (#2100)	2016-08-17 17:50:42 -07:00
help.jade	docs: use Jade include rather than Harp partial (#2392)	2016-09-19 20:08:03 -07:00
index.jade	docs(lang/latest): parameterize landing page Jade by language (#2389)	2016-09-19 20:14:31 -07:00
quickstart.jade	docs(quickstart.js): fix typo (#2614)	2016-10-18 15:09:49 +02:00
resources.jade	docs: simplify left nav selection/scroll	2016-03-04 23:54:44 -08:00
styleguide.jade	docs: use Jade include rather than Harp partial (#2392)	2016-09-19 20:08:03 -07:00