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.

charithag 9db84846ce Merge remote-tracking branch 'upstream/master' ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml # components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java # pom.xml		9 years ago
..
src/main/resources	Merge remote-tracking branch 'upstream/master'	9 years ago
pom.xml	Fix mdm-admin app name	9 years ago