Victor Woeltjen 7974ffdda2 Merge remote-tracking branch 'github/master' into open245b
...in preparation to complete merge nasa/openmctweb#257

Conflicts:
	platform/entanglement/src/actions/CopyAction.js
	platform/entanglement/src/actions/LinkAction.js
	platform/entanglement/src/actions/MoveAction.js
2015-11-21 07:05:51 -08:00
..
2015-11-05 15:24:57 -08:00
2014-10-27 18:18:50 -07:00

This bundle contains core software components of Open MCT Web. These components describe MCT's information model, and are responsible for introducing the API and infrastructure which supports domain objects.