device-mgt-core/components/device-mgt
sinthuja d214411f9a 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-10-17 18:31:47 +05:30
..
org.wso2.carbon.device.mgt.analytics.data.publisher [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
org.wso2.carbon.device.mgt.api [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
org.wso2.carbon.device.mgt.common [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
org.wso2.carbon.device.mgt.core Merge branch 'wso2-master' into origin-wso2-master 2017-10-17 18:31:47 +05:30
org.wso2.carbon.device.mgt.extensions [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
org.wso2.carbon.device.mgt.ui [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
org.wso2.carbon.device.mgt.url.printer [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00
pom.xml [WSO2 Release] [Jenkins #2768] [Release 3.0.161] prepare for next development iteration 2017-10-17 12:27:25 +00:00