Zhimin YE (Rex) 0e14785cba Merge remote-tracking branch 'angular.io/master' ... # Conflicts: # README.md # public/_includes/_footer.jade # public/_includes/_hero-home.jade # public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/dependency-injection.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/style-guide.jade # public/docs/ts/latest/testing/first-app-tests.jade # public/docs/ts/latest/testing/jasmine-testing-101.jade # public/docs/ts/latest/tutorial/toh-pt5.jade		2016-07-15 15:52:34 +01:00
..
_data.json	开发指南-测试 初译完毕	2016-05-30 19:23:17 +08:00
application-under-test.jade	开发指南-测试 pipe还剩半章	2016-05-30 16:39:21 +08:00
first-app-tests.jade	Merge remote-tracking branch 'angular.io/master'	2016-07-15 15:52:34 +01:00
index.jade	翻译完了“升级”一章的新增部分	2016-05-31 12:35:37 +08:00
jasmine-testing-101.jade	Merge remote-tracking branch 'angular.io/master'	2016-07-15 15:52:34 +01:00
testing-an-angular-pipe.jade	Merge remote-tracking branch 'angular.io/master'	2016-07-15 15:52:34 +01:00