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.

sinthuja 5f773a51c7 Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml		8 years ago
..
analytics-feature	[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration	8 years ago
device-types-feature	Merge branch 'wso2-master'	8 years ago
etc	Adding the feature.property file and changing the carbon-device-mgt components version	10 years ago
extensions-feature	[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration	8 years ago
mobile-plugins-feature	[WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration	8 years ago