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 37a15e927d Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml		7 years ago
..
input	Merge branch 'wso2-master'	7 years ago
output	[maven-release-plugin] prepare for next development iteration	7 years ago
pom.xml	[maven-release-plugin] prepare for next development iteration	7 years ago