device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.core/src
sinthuja 32878c3ad7 Merge branch 'wso2-master' into origin-wso2-master
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java
2017-09-28 18:20:26 +05:30
..
main Merge branch 'wso2-master' into origin-wso2-master 2017-09-28 18:20:26 +05:30
test Merge branch 'wso2-master' into origin-wso2-master 2017-09-28 18:20:26 +05:30