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 505b87a655 Merge remote-tracking branch 'upstream/master' ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java		10 years ago
..
device-mgt	Merge remote-tracking branch 'upstream/master'	10 years ago
key-mgt	…
policy-mgt	…