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
..
src/main/resources/dbscripts/archival	Merge branch 'master' of git://github.com/wso2/carbon-device-mgt	7 years ago
pom.xml	[WSO2 Release] [Jenkins #2798] [Release 3.0.177] prepare for next development iteration	7 years ago