megala21 974a113ac3 Resolving conflicts		2017-05-16 14:39:17 +05:30
..
integration-common	Resolving conflicts	2017-05-16 14:39:17 +05:30
web-ui-pages	Merging the changes from wso2/master.	2017-03-20 17:47:04 +05:30
pom.xml	Fixing the integration test framework to work with new packaging structure.	2017-03-29 20:40:45 +05:30