Merge branch 'wso2-master'

# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
This commit is contained in:
sinthuja 2017-05-09 12:09:22 +05:30
commit 7ddf1483b8

View File

@ -21,7 +21,7 @@
<parent>
<artifactId>virtual-fire-alarm-plugin</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>3.0.33-SNAPSHOT</version>
<version>3.0.34-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>