mirror of
https://github.com/nasa/openmct.git
synced 2025-03-23 20:45:17 +00:00
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
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.