Menaka Jayawardena 0e32b646d3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x ... # Conflicts: # components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs		2016-12-07 12:09:50 +05:30
..
androidsense-plugin	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-07 12:09:50 +05:30
arduino-plugin	Adding changes to descriptor and ui changes	2016-12-06 17:22:45 +05:30
raspberrypi-plugin	Adding changes to descriptor and ui changes	2016-12-06 17:22:45 +05:30
virtual-fire-alarm-plugin	Merge pull request #446 from DimalChandrasiri/release-3.0.x	2016-12-05 14:19:44 +05:30
pom.xml	[maven-release-plugin] prepare for next development iteration	2016-12-01 13:52:49 +00:00