Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/glossary.jade
#	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/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade

2016-05-03 22:33:20 +08:00

..

app.component.html

docs: rename heros to heroes

2016-05-01 23:04:47 +02:00

app.component.ts

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

astronaut.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

countdown-parent.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

countdown-timer.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

hero-child.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

hero-parent.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

hero.ts

chore(toh): change inputs array for input decorator/hero now a class

2016-03-25 16:51:46 -07:00

main.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

mission.service.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

missioncontrol.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

name-child.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

name-parent.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

version-child.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

version-parent.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

voter.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00

votetaker.component.ts

chore: update to rc.0

2016-05-02 19:57:28 -07:00