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
..
org.wso2.carbon.device.mgt.analytics.dashboard	[maven-release-plugin] prepare for next development iteration	2016-09-09 20:18:25 +05:30
org.wso2.carbon.device.mgt.analytics.data.publisher	Merging with master	2016-09-19 12:21:41 +05:30
org.wso2.carbon.device.mgt.api	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	2016-09-20 17:02:28 +05:30
org.wso2.carbon.device.mgt.common	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	2016-09-20 17:02:28 +05:30
org.wso2.carbon.device.mgt.core	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	2016-09-20 17:02:28 +05:30
org.wso2.carbon.device.mgt.extensions	Merging with master	2016-09-19 12:21:41 +05:30
org.wso2.carbon.device.mgt.ui	Refactoring user-menu - UI	2016-09-20 16:27:07 +05:30
pom.xml	[maven-release-plugin] prepare for next development iteration	2016-09-09 20:18:25 +05:30