Zhicheng Wang d034bc33c8 Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/contribute.jade # public/docs/js/latest/cookbook/ts-to-js.jade # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/cookbook/component-communication.jade # public/docs/ts/latest/cookbook/component-relative-paths.jade # public/docs/ts/latest/cookbook/dependency-injection.jade # public/docs/ts/latest/cookbook/dynamic-form.jade # public/docs/ts/latest/cookbook/set-document-title.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/pipes.jade # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/user-input.jade # public/docs/ts/latest/tutorial/toh-pt6.jade		2016-08-06 19:52:08 +08:00
..
_banner.jade	直接加空格方式效果不理想，改用js和css配合来加空格	2016-06-19 16:46:50 +08:00
_cta-bar.jade	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
_footer.jade	launch(china): announce angular.cn	2016-07-11 22:45:23 -07:00
_head-include.jade	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00
_hero-home.jade	Merge remote-tracking branch 'angular.io/master'	2016-08-01 09:52:29 +01:00
_hero.jade	Merge remote-tracking branch 'origin/master'	2016-07-17 20:40:12 +08:00
_hover-card.jade	bugfix: 去掉了多加的translate-cn	2016-06-19 17:11:40 +08:00
_logo-shield.jade	sub header, cta bar, logos, announcement	2015-02-26 21:30:06 -08:00
_main-nav.jade	chore: hide the english toggle link until angular is loaded	2016-07-15 17:58:01 +02:00
_next-item.jade	Merge remote-tracking branch 'origin/master'	2016-08-06 19:52:08 +08:00
_scripts-include.jade	更换跟踪ID	2016-07-07 09:50:10 +08:00
_util-fns.jade	Merge remote-tracking branch 'origin/master'	2016-06-28 09:40:49 +08:00
_version-dropdown.jade	重新开放dart版	2016-06-23 08:05:05 +08:00