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

[Frontend] Apply flex layout to object header elements

2015-11-06 17:42:54 -08:00

src

[Layout] Update raw positions on drop

2015-12-08 15:08:30 -08:00

test

Merge remote-tracking branch 'github/master' into open116

2015-12-30 10:15:05 -08:00

bundle.js

[API] Convert JSON bundles to imperative form

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