Victor Woeltjen d8276c532b Merge remote-tracking branch 'github/master' into open115b
Merge in latest from master into topic branch for
nasa/openmctweb#115

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
	platform/features/conductor/src/ConductorTelemetrySeries.js
	platform/features/conductor/src/TimeConductor.js
	platform/features/conductor/test/ConductorRepresenterSpec.js
	platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
2015-10-09 10:04:15 -07:00
..
2015-08-07 11:44:54 -07:00
2015-08-07 11:44:54 -07:00
2014-10-27 18:18:50 -07:00

This directory contains bundles which represent specific user-facing features of Open MCT Web, such as plots and other visualizations. Bundles in this directory should be effectively optional.