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.

Dunith Dhanushka 7f9cf0ffea Merge branch 'master' of git://github.com/wso2/carbon-device-mgt ... # Resolving Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java		7 years ago
..
org.wso2.carbon.device.mgt.analytics.data.publisher.feature	…
org.wso2.carbon.device.mgt.api.feature	…
org.wso2.carbon.device.mgt.basics.feature	…
org.wso2.carbon.device.mgt.extensions.feature	…
org.wso2.carbon.device.mgt.feature	…
org.wso2.carbon.device.mgt.server.feature	…
org.wso2.carbon.device.mgt.ui.feature	…
pom.xml	…