Merge from master
authorBob Gallagher <bob.gallagher@riftio.com>
Mon, 24 Apr 2017 17:57:43 +0000 (13:57 -0400)
committerBob Gallagher <bob.gallagher@riftio.com>
Mon, 24 Apr 2017 17:57:43 +0000 (13:57 -0400)
commitf9a2688a7553a59ce700ea5edb859f89eecb8a29
tree2d1f5c3adfa4799d8504a6259db018a33f4deb51
parent8d3a5ec71ebb2f7f2932fee5732ae62718ca8efb
Merge from master

Change-Id: I8d374af11a10b7ba37d25a8c6c2b89275a49beb6
Signed-off-by: Bob Gallagher <bob.gallagher@riftio.com>
skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaFactory.js
skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
skyquake/plugins/launchpad/src/instantiate/instantiateStore.js