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 783ead216e Merge branch 'wso2-application-mgt' into application-mgt ... # Conflicts: # components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java		7 years ago
..
src/main/resources	Merge branch 'wso2-application-mgt' into application-mgt	7 years ago
pom.xml	Merging with master	7 years ago