device-mgt-core/components/device-mgt/org.wso2.carbon.device.mgt.common
Ace 33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
2016-09-20 17:02:28 +05:30
..
src/main/java/org/wso2/carbon/device/mgt/common Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-19 12:22:08 +05:30
pom.xml Fixing intermittent jackson bind issue 2016-09-20 12:07:14 +05:30