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.

manoj d790d343a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java		10 years ago
..
device-mgt	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	10 years ago
key-mgt	CDMF-6 fix	10 years ago
policy-mgt	Seperating the dao to Feature, profile, policy and adding the exeception for each ones	10 years ago
user-mgt	Email management	10 years ago