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.

charitha 2cac0053ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java		6 years ago
..
src	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master	6 years ago
pom.xml	[WSO2 Release] [Jenkins #3015] [Release 3.1.32] prepare for next development iteration	6 years ago