Victor Woeltjen fa8095d5bc Merge branch 'open-master' into open1317limits2
WTD-1405

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
2015-06-29 17:30:33 -07:00
..
2015-06-25 14:36:14 -07:00
2015-05-13 16:43:30 -07:00
2015-06-29 13:15:56 -07:00
2014-10-27 18:18:50 -07:00

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.