device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.core/src
Dunith Dhanushka 7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
# Resolving Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
2017-11-22 11:14:32 +05:30
..
main Merge branch 'master' of git://github.com/wso2/carbon-device-mgt 2017-11-22 11:14:32 +05:30
test Added class level comments. 2017-11-17 11:58:30 +05:30