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.

ayyoob 7117fdeafc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 ... Conflicts: pom.xml		8 years ago
..
analytics-feature	[WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration	8 years ago
device-types-feature	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	8 years ago
etc	Adding the feature.property file and changing the carbon-device-mgt components version	10 years ago
extensions-feature	updated version	8 years ago
mobile-plugins-feature	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0	8 years ago