Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/_data.json # public/_includes/_footer.jade # public/_includes/_hero-home.jade # public/_includes/_main-nav.jade # public/docs/_includes/_side-nav.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/displaying-data.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/user-input.jade # public/docs/ts/latest/index.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt2.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/features.jade # public/index.jade		2016-05-03 22:33:20 +08:00
..
_banner.jade	banner for dart and image fix	2015-04-23 08:58:53 -07:00
_cta-bar.jade	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
_footer.jade	Merge remote-tracking branch 'origin/master'	2016-05-03 22:33:20 +08:00
_head-include.jade	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
_hero-home.jade	Merge remote-tracking branch 'origin/master'	2016-05-03 22:33:20 +08:00
_hero.jade	fix(badge align): fix alignment of badges on all screens. Simplify logic to achieve this	2016-04-26 10:53:53 -07:00
_hover-card.jade	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
_logo-shield.jade	sub header, cta bar, logos, announcement	2015-02-26 21:30:06 -08:00
_main-nav.jade	Merge remote-tracking branch 'origin/master'	2016-05-03 22:33:20 +08:00
_next-item.jade	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
_scripts-include.jade	移除google CDN，以免被GFW挡住	2016-04-13 08:53:17 +08:00
_util-fns.jade	Merge remote-tracking branch 'origin/master'	2016-05-03 22:33:20 +08:00
_version-dropdown.jade	Merge remote-tracking branch 'origin/master'	2016-04-23 15:13:58 +08:00