sinthuja 37a15e927d Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml		2017-05-08 14:28:07 +05:30
..
androidsense-plugin-feature	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30
arduino-plugin-feature	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30
raspberrypi-plugin-feature	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30
virtual-fire-alarm-plugin-feature	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30
pom.xml	[maven-release-plugin] prepare for next development iteration	2017-05-08 12:44:37 +05:30