Victor Woeltjen d3f2a24267 Merge branch 'master' into persist-on-mutation-825
Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
2016-05-19 11:41:08 -07:00
..
2016-03-04 11:41:48 -08:00
2016-04-08 16:08:19 -07:00
2016-04-08 16:08:19 -07:00
2016-04-08 16:08:19 -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.