device-mgt-core/features/device-mgt
mharindu a2c3813588 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
	features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
2015-05-20 16:09:27 +05:30
..
org.wso2.carbon.device.mgt.server.feature Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-20 16:09:27 +05:30
pom.xml [maven-release-plugin] prepare for next development iteration 2015-02-24 14:29:34 +05:30