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 2f3819107a Merge branch 'wso2-master' into test-merge ... # Conflicts: # modules/distribution/src/assembly/bin.xml # modules/distribution/src/core/plugins/plugins-deployer.xml # modules/p2-profile/iot-core-profile/pom.xml # pom.xml		8 years ago
..
src	Merge branch 'wso2-master' into test-merge	8 years ago
pom.xml	added filter properties to pick the parent plugins version	8 years ago