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
..
_includes	Merge remote-tracking branch 'origin/master'	2017-04-15 15:34:47 +08:00
about	Merge remote-tracking branch 'origin/master'	2017-02-26 15:39:42 +08:00
cardboard	Merge remote-tracking branch 'origin/master'	2017-02-26 15:39:42 +08:00
docs	Merge remote-tracking branch 'origin/master'	2017-04-15 15:34:47 +08:00
resources	Merge remote-tracking branch 'origin/master'	2017-04-15 15:34:47 +08:00
search	Upgrade swiftype to 2.0 library and added a results page for searches	2016-10-12 10:01:19 -07:00
translate/cn	chore: 添加鸣谢	2017-03-12 12:06:36 +08:00
404.jade	微调	2016-06-02 15:17:55 +08:00
_data.json	Merge remote-tracking branch 'origin/master'	2017-04-15 15:34:47 +08:00
_layout.jade	chore: define alt ng2 layout for top-level pages (#2686)	2016-10-28 01:08:53 +01:00
contribute.jade	remove 一个	2016-09-25 19:58:46 +01:00
events.jade	Merge remote-tracking branch 'origin/master'	2017-04-15 15:34:47 +08:00
favicon.ico	Add favicon.ico to the top level of the site	2015-03-03 04:32:05 -08:00
features.jade	fix： change all 他 > 它	2016-09-25 19:50:45 +01:00
google5a670c2e11d1d2f6.html	chore(verification): verify domain ownership for google	2016-01-26 15:15:21 -08:00
googleb96cceae5888d79f.html	chore(webmaster): update webmaster tools key	2015-12-15 10:21:17 -08:00
index.jade	design(style): Restyle changes from Alex	2016-09-14 17:18:55 -07:00
license	chore: add gulp link-checker task	2016-03-10 23:53:43 -08:00
license.txt	chore: update copyrights in docs to 2017 (#3067)	2017-01-05 15:14:32 -08:00
presskit.jade	Merge remote-tracking branch 'origin/master'	2017-04-15 15:34:47 +08:00
support.jade	Merge remote-tracking branch 'remotes/angular.io/master'	2016-09-23 22:13:02 +01:00
survey.html	完成了各种公共页面的汉化	2016-04-13 08:53:17 +08:00