Victor Woeltjen 99376391a9 Merge remote-tracking branch 'github/master' into open229b
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
2015-11-03 16:58:40 -08:00
..
2014-12-24 10:28:58 -08:00

This bundle is responsible for introducing a reusable infrastructure and set of APIs for using time-series data in Open MCT Web.