Victor Woeltjen 0036974c60 Merge remote-tracking branch 'github/master' into open450b ...

Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json

2016-01-08 15:36:10 -08:00

..

res/templates

Merge remote-tracking branch 'origin/open1223' into open-1338

2015-06-29 12:08:16 -07:00

src

[Time Conductor] Use domain formats in scrolling list

2015-10-27 12:37:53 -07:00

test

[Time Conductor] Update RangeColumn spec

2015-12-30 10:10:23 -08:00

bundle.js

[API] Convert JSON bundles to imperative form

2016-01-07 15:08:08 -08:00