Victor Woeltjen a49deb5ab1 Merge remote-tracking branch 'github/master' into open116
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116

Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
	platform/features/plot/test/PlotControllerSpec.js
2015-12-30 10:15:05 -08:00
..
2015-08-11 13:03:06 -07:00
2014-10-27 18:18:50 -07:00
2015-11-20 11:12:29 -08:00
2015-09-18 15:10:21 -07:00
2015-11-20 09:46:08 -08:00
2015-12-07 13:22:40 -08:00
2014-10-27 18:18:50 -07:00

This directory contains all bundles for the Open MCT Web platform, as well as the framework which runs them.