Victor Woeltjen e31d9decdc Merge remote-tracking branch 'github/master' into open245b ...

Conflicts:
	docs/src/guide/index.md
	platform/core/src/capabilities/InstantiationCapability.js

2015-11-09 15:17:53 -08:00

..

architecture

Removed inserted TOC

2015-10-20 21:16:54 -07:00

guide

Merge remote-tracking branch 'github/master' into open245b

2015-11-09 15:17:53 -08:00

tutorials

Removed inserted TOC

2015-10-20 21:16:54 -07:00

index.html

Fixed code formatting error

2015-10-13 13:54:24 -07:00