Zhimin YE (Rex) 72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master' ... # Conflicts: # README.md # public/contribute.jade # public/docs/_examples/cb-component-communication/e2e-spec.ts # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/npm-packages.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/guide/webpack.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt5.jade		2016-06-01 09:51:27 +01:00
..
e2e.d.ts	chore: support e2e-specs written in TypeScript	2016-05-31 22:03:13 -07:00
package.json	chore: support e2e-specs written in TypeScript	2016-05-31 22:03:13 -07:00
protractor.config.js	Merge remote-tracking branch 'remotes/angular.io/master'	2016-06-01 09:51:27 +01:00
tsconfig.json	chore: support e2e-specs written in TypeScript	2016-05-31 22:03:13 -07:00
typings.json	chore: support e2e-specs written in TypeScript	2016-05-31 22:03:13 -07:00