Zhicheng Wang 5f1f27e09c Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/_data.json # public/_includes/_hero-home.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/cookbook/component-communication.jade # public/docs/ts/latest/cookbook/dependency-injection.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/attribute-directives.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/style-guide.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt4.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/news.jade # public/resources/index.jade		2016-05-19 13:33:02 +08:00
..
_data.json	教程第五章翻译了多一半儿，把黑板报批量改为仪表盘，把英雄之旅批量改为英雄指南	2016-04-17 23:31:22 +08:00
index.jade	基础知识-显示数据 一审了一半儿	2016-05-16 13:44:00 +08:00
toh-pt1.jade	把QuickStart改成“快速起步”	2016-05-18 13:30:07 +08:00
toh-pt2.jade	把部分expose统一译为暴露	2016-05-16 23:15:02 +08:00
toh-pt3.jade	把属性型指令统一改为Attribute型指令	2016-05-13 15:54:34 +08:00
toh-pt4.jade	Merge remote-tracking branch 'origin/master'	2016-05-19 13:33:02 +08:00
toh-pt5.jade	Merge remote-tracking branch 'origin/master'	2016-05-19 13:33:02 +08:00