community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
02b99eb442
device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src
History
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
..
main Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-08-13 12:20:51 +05:30
test Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master 2018-08-13 12:20:51 +05:30