angular-cn/public/_includes
Zhicheng Wang f5c85b3e82 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_scripts-include.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	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/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/appmodule.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/component-styles.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/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/learning-angular.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/events.jade
#	public/news.jade
#	public/presskit.jade
2017-04-15 15:34:47 +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 Merge remote-tracking branch 'origin/master' 2017-04-15 15:34:47 +08:00
_head-include.jade Merge remote-tracking branch 'angular.io/master' into merge-review-rex 2016-11-05 14:08:21 +00:00
_hero-home.jade Merge remote-tracking branch 'origin/master' 2017-04-15 15:34:47 +08:00
_hero.jade Merge remote-tracking branch 'origin/master' 2017-04-15 15:34:47 +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 Merge remote-tracking branch 'origin/master' 2017-04-15 15:34:47 +08:00
_next-item.jade Merge remote-tracking branch 'angular.io/master' 2016-11-26 21:43:16 +00:00
_scripts-include.jade Merge remote-tracking branch 'origin/master' 2017-04-15 15:34:47 +08:00
_scripts-minimum.jade 移除被墙的地址 2016-11-01 10:22:16 +08:00
_util-fns.jade Merge remote-tracking branch 'origin/master' 2017-02-26 15:39:42 +08:00
_version-dropdown.jade Merge remote-tracking branch 'origin/master' 2017-02-26 15:39:42 +08:00