device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main
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
2018-08-13 12:20:51 +05:30
..
java/org/wso2/carbon/device/mgt/jaxrs Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-08-13 12:20:51 +05:30
webapp Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30