Zhicheng Wang 21fe9dc1d2 Merge remote-tracking branch 'origin/master' ... # Conflicts: # README.md # public/docs/js/latest/cookbook/ts-to-js.jade # public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/attribute-directives.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/lifecycle-hooks.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/testing/first-app-tests.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/docs/ts/latest/tutorial/toh-pt6.jade # public/news.jade		2016-07-01 08:24:23 +08: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 'origin/master'	2016-07-01 08:24:23 +08:00
index.jade	翻译完了“升级”一章的新增部分	2016-05-31 12:35:37 +08:00
jasmine-testing-101.jade	把所有全角括号改成了半角的	2016-06-14 09:26:54 +08:00
testing-an-angular-pipe.jade	把所有全角括号改成了半角的	2016-06-14 09:26:54 +08:00