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

..

res/templates

[Frontend] Time Controller Markup and Styling

2015-09-24 15:38:52 -07:00

src

[Plot] Move throttling out of plot

2015-10-02 16:11:12 -07:00

test

[Test Conductor] Add test case for requery

2015-09-16 17:00:56 -07:00

bundle.json

Merge remote-tracking branch 'origin/open1273' into open-1340

2015-06-26 15:03:19 -07:00