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.

Ace 33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java		8 years ago
..
src	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7	8 years ago
pom.xml	Updating velocity dependencies to OSGI enabled bundle version	8 years ago