device-mgt-core/features/device-mgt/org.wso2.carbon.device.mgt.server.feature
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
..
src/main/resources Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-05-20 16:09:27 +05:30
pom.xml Operations Refractor 2015-04-24 12:53:07 +05:30