You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		8 years ago
..
components	…
distribution	Merge branch 'pr1049' into origin-master	8 years ago
features	…
integration	Merge pull request #1045 from ayyoob/devicetype-3.1.0	8 years ago
p2-profile	Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0	8 years ago
scripts	…
tools	…