You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

charitha b3094277fd Merge branch 'master' into add-emm-analytics ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java		7 years ago
..
org.wso2.carbon.device.mgt.analytics.data.publisher.feature	[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration	7 years ago
org.wso2.carbon.device.mgt.api.feature	[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration	7 years ago
org.wso2.carbon.device.mgt.basics.feature	Fixed build and test failures after upstream merge	7 years ago
org.wso2.carbon.device.mgt.extensions.feature	[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration	7 years ago
org.wso2.carbon.device.mgt.feature	[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration	7 years ago
org.wso2.carbon.device.mgt.server.feature	Merge branch 'master' into add-emm-analytics	7 years ago
org.wso2.carbon.device.mgt.ui.feature	[WSO2 Release] [Jenkins #2784] [Release 3.0.169] prepare for next development iteration	7 years ago
pom.xml	Merge branch 'master' into add-emm-analytics	7 years ago