Zhimin YE (Rex) 72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master' ... # Conflicts: # README.md # public/contribute.jade # public/docs/_examples/cb-component-communication/e2e-spec.ts # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/npm-packages.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/guide/webpack.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt5.jade		2016-06-01 09:51:27 +01:00
..
css	翻译完了“升级”一章的新增部分	2016-05-31 12:35:37 +08:00
fonts/vendor	完成了导航菜单	2016-04-13 08:53:17 +08:00
images	docs(template-syntax): add brief example of HTML sanitization in binding.	2016-05-31 18:36:22 -07:00
js	对所有外站链接，直接开新窗口打开，修改小bug	2016-05-31 18:02:57 +08:00
_data.json	feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page	2016-04-29 21:48:07 -07:00
index.ejs	fix(resources): use title key from firebase. Adjust layout a bit	2016-05-17 19:15:57 -04:00
index.jade	Merge remote-tracking branch 'origin/master'	2016-05-19 13:33:02 +08:00