Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master' ...

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

2016-09-26 15:14:39 +01:00

..

cookbook

docs(testing): from Igor Minar feedback (Part 1) (#2450)

2016-09-23 02:03:20 -07:00

guide

chore: convert templateUrls to use moduleId where possible. (#2477)

2016-09-25 18:51:54 -07:00

testing

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00

tutorial

docs(tutorial): don't use shredder for intro page (#2388)

2016-09-19 16:56:17 -07:00

_data.json

docs: fix {ts,dart,js}/latest/_data.json (#2387)

2016-09-20 00:52:41 +02:00

_quickstart_repo.jade

docs(guide/displaying-data): proofread (#1819)

2016-07-07 14:00:19 -07:00

_util-fns.jade

Merge remote-tracking branch 'remotes/angular.io/master'

2016-08-23 14:02:54 +01:00

cheatsheet.jade

chore(cheatsheet): fix double banner issue (#2293)

2016-09-08 15:01:39 -07:00

glossary.jade

docs(glossary): general cleanup and fix links (#2100)

2016-08-17 17:50:42 -07:00

help.jade

docs(help&support): create Dart version of help & support page

2016-01-14 14:51:13 -08:00

index.jade

docs(lang/latest): parameterize landing page Jade by language (#2389)

2016-09-19 20:14:31 -07:00

quickstart.jade

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

resources.jade

docs: simplify left nav selection/scroll

2016-03-04 23:54:44 -08:00

styleguide.jade

docs: use Jade include rather than Harp partial (#2392)

2016-09-19 20:08:03 -07:00