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
..
analytics	Updating the license headers.	2017-06-23 15:51:30 +05:30
assembly	Cleaning up the files pom files.	2017-06-23 15:25:45 +05:30
broker	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0	2017-06-17 19:33:14 +05:30
core	Merge branch 'pr1049' into origin-master	2017-06-23 17:10:14 +05:30