Merge branch 'master' into projects
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Fri, 5 May 2017 15:37:55 +0000 (11:37 -0400)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Fri, 5 May 2017 15:37:55 +0000 (11:37 -0400)
commit6fc3e77438cd4e53c5d5f21512ee8ca260469ca8
treecdcc9537c61e06ba69a0883fe1c1a732e362ffe4
parentb78cde7361f4c72441e3dae0b14e116f62895698
parentae7bbd19c580eae550ac91d549e35c1e34289503
Merge branch 'master' into projects
skyquake/plugins/composer/api/composer.js
skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
skyquake/plugins/composer/src/src/components/filemanager/FileManagerSource.js
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx