Zhicheng Wang d7fd581c37 Merge branch 'master' into aio ... # Conflicts: # aio/content/guide/ajs-quick-reference.md # aio/content/guide/animations.md # aio/content/guide/browser-support.md # aio/content/guide/form-validation.md # aio/content/guide/i18n.md # aio/content/guide/pipes.md # aio/content/guide/router.md # aio/content/guide/set-document-title.md # aio/content/guide/structural-directives.md # aio/content/guide/template-syntax.md # aio/content/guide/testing.md # aio/content/marketing/resources.json # aio/content/tutorial/toh-pt1.md # aio/content/tutorial/toh-pt2.md # aio/content/tutorial/toh-pt3.md # aio/content/tutorial/toh-pt4.md # aio/content/tutorial/toh-pt5.md		2017-10-01 13:22:33 +08:00
..
bios	docs(aio): add Nir Kaufman to GDE resources (#19012)	2017-09-05 15:34:06 -05:00
guide	feat(compiler): set `enableLegacyTemplate` to false by default (#18756)	2017-08-31 18:38:34 -07:00
marketing	refactor(aio): move content-specific images to `content/images/`	2017-07-28 15:06:49 -07:00
plunker	docs(aio): pngcrush all pngs (#18243)	2017-07-20 17:47:06 -05:00
translations/cn	fix: retranslate navigation	2017-07-30 13:35:27 +08:00