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		2017-05-08 22:48:51 +05:30
..
src	Merge branch 'wso2-master' into test-merge	2017-05-08 22:48:51 +05:30
pom.xml	added filter properties to pick the parent plugins version	2017-05-05 01:55:19 +05:30