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.

Dilshan Edirisuriya 3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java		9 years ago
..
org.wso2.carbon.device.mgt.common	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	9 years ago
org.wso2.carbon.device.mgt.core	Updating DAO Layer	9 years ago
org.wso2.carbon.device.mgt.extensions	Code cleanup	9 years ago
pom.xml	Making apimgt extensions module a separate component/feature pair	9 years ago