sinthuja 2803ba29e7 Merge branch 'pr1049' into origin-master ... # Conflicts: # modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs		2017-06-23 17:10:14 +05:30
..
components	Updating the pom.xml names, and resolving the warnings during the build.	2017-03-21 20:37:01 +05:30
distribution	Merge branch 'pr1049' into origin-master	2017-06-23 17:10:14 +05:30
features	Updating the pom.xml names, and resolving the warnings during the build.	2017-03-21 20:37:01 +05:30
integration	Merge pull request #1045 from ayyoob/devicetype-3.1.0	2017-06-23 15:56:24 +05:30
p2-profile	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0	2017-06-23 04:12:26 +05:30
scripts	added missing appm features and installed android sense feature to the default pack	2017-05-05 01:36:36 +05:30
tools	Fixing the pom relative path issue.	2017-03-22 15:48:26 +05:30