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 9398e7ee0b Merge branch 'wso2-master' ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java		8 years ago
..
src/main/resources	Merge branch 'wso2-master'	8 years ago
pom.xml	[WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration	8 years ago