Hasunie 222ef41a3f Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x		2016-12-09 10:43:50 +05:30
..
analytics	Resolved conflicts	2016-12-08 16:40:18 +05:30
device-types	Added new Android Sense Agent	2016-12-08 17:56:29 +05:30
extensions	Fix issues	2016-12-08 20:07:16 +05:30
iot-plugins/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.device-view	Resolved conflicts with release-3.0.x	2016-12-08 18:07:14 +05:30
mobile-plugins	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2016-12-09 10:43:50 +05:30