Zhicheng Wang 2417245114 Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/_data.json # public/_includes/_footer.jade # public/_includes/_hero-home.jade # public/_includes/_hero.jade # public/_includes/_main-nav.jade # public/_includes/_util-fns.jade # public/docs/_includes/_side-nav.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/cookbook/a1-a2-quick-reference.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/ngmodule.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/style-guide.jade # public/docs/ts/latest/guide/testing.jade # public/docs/ts/latest/index.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/testing/_data.json # public/docs/ts/latest/testing/application-under-test.jade # public/docs/ts/latest/testing/first-app-tests.jade # public/docs/ts/latest/testing/index.jade # public/docs/ts/latest/testing/jasmine-testing-101.jade # public/docs/ts/latest/testing/testing-an-angular-pipe.jade # public/index.jade # public/resources/css/main.scss # public/resources/css/module/_side-nav.scss		2016-09-15 15:23:48 +08:00
..
e2e.d.ts	chore: support e2e-specs written in TypeScript	2016-05-31 22:03:13 -07:00
package.json	chore: update examples to TS2.0 (#2329)	2016-09-14 10:15:51 -07:00
protractor.config.js	Merge remote-tracking branch 'remotes/angular.io/master'	2016-06-02 08:58:19 +01:00
tsconfig.json	chore: add async/await support to e2e tests	2016-06-17 10:43:16 -07:00
typings.json	chore: update to rc3	2016-06-22 01:51:57 +01:00