Yohan Avishke 8489dec2b1 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventStream.java # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java		2019-10-16 07:24:03 +05:30
..
io.entgra.carbon.device.mgt.config.api	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.analytics.data.publisher	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.analytics.wsproxy	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.api	Merge remote-tracking branch 'upstream/master'	2019-10-16 07:24:03 +05:30
org.wso2.carbon.device.mgt.common	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.core	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.extensions	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.ui	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.url.printer	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
org.wso2.carbon.device.mgt.v09.api	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00
pom.xml	[maven-release-plugin]prepare for next development iteration	2019-10-14 15:53:20 +00:00