rexebin edda524d0d Merge remote-tracking branch 'angular.io/master' ... # Conflicts: # .travis.yml # public/_includes/_footer.jade # public/_includes/_hero-home.jade # public/_includes/_next-item.jade # public/_includes/_util-fns.jade # public/_includes/_version-dropdown.jade # public/docs/_examples/package.json # public/docs/_examples/quickstart/dart/lib/app_component.dart # public/docs/_examples/quickstart/e2e-spec.ts # public/docs/_examples/quickstart/js/app/app.component.js # public/docs/_examples/quickstart/ts/app/app.component.ts # public/docs/_examples/quickstart/ts/index.html # public/docs/_examples/toh-5/dart/lib/dashboard_component.html # public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart # public/docs/dart/latest/_util-fns.jade # public/docs/dart/latest/guide/_data.json # public/docs/dart/latest/guide/index.jade # public/docs/dart/latest/quickstart.jade # public/docs/index.jade # public/docs/js/latest/quickstart.jade # public/docs/ts/_cache/glossary.jade # public/docs/ts/_cache/guide/dependency-injection.jade # public/docs/ts/_cache/guide/index.jade # public/docs/ts/_cache/quickstart.jade # public/docs/ts/_cache/tutorial/toh-pt5.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/_quickstart_repo.jade # public/docs/ts/latest/cli-quickstart.jade # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade # public/docs/ts/latest/cookbook/aot-compiler.jade # public/docs/ts/latest/cookbook/dynamic-form.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/attribute-directives.jade # public/docs/ts/latest/guide/browser-support.jade # public/docs/ts/latest/guide/change-log.jade # public/docs/ts/latest/guide/dependency-injection.jade # public/docs/ts/latest/guide/displaying-data.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/index.jade # public/docs/ts/latest/guide/lifecycle-hooks.jade # public/docs/ts/latest/guide/ngmodule.jade # public/docs/ts/latest/guide/npm-packages.jade # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/server-communication.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/typescript-configuration.jade # public/docs/ts/latest/guide/upgrade.jade # public/docs/ts/latest/guide/user-input.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/_data.json # public/docs/ts/latest/tutorial/index.jade # public/docs/ts/latest/tutorial/toh-pt1.jade # public/docs/ts/latest/tutorial/toh-pt3.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/docs/ts/latest/tutorial/toh-pt6.jade # public/events.jade # public/resources/images/devguide/quickstart/hello-angular.png # scripts/cache.sh # tools/plunker-builder/indexHtmlTranslator.js		2016-11-26 21:43:16 +00:00
..
api	api(cleanup): Remove preview from the API reference banner	2016-10-07 14:32:48 -07:00
cookbook	Upgrade to 2.2.0	2016-11-22 20:07:16 +08:00
guide	fix api display	2016-11-26 14:53:33 +00:00
tutorial	docs: use Jade include rather than Harp partial (#2392)	2016-09-19 20:08:03 -07:00
_data.json	Upgrade to 2.2.0	2016-11-22 20:07:16 +08: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	Merge remote-tracking branch 'angular.io/master'	2016-11-26 21:43:16 +00: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