Menaka Jayawardena 5d41fe313b Merge branch 'backend-integration' ... # Conflicts: # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java # modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java # modules/integration/tests-integration/src/test/resources/automation.xml # modules/integration/tests-integration/src/test/resources/testng.xml		2017-01-25 15:50:43 +05:30
..
tests-artifacts	Pom versions updated.	2017-01-24 11:31:16 +05:30
tests-common	Merge branch 'backend-integration'	2017-01-25 15:50:43 +05:30
tests-integration	Merge branch 'backend-integration'	2017-01-25 15:50:43 +05:30
tests-integration-old	Merge branch 'backend-integration'	2017-01-25 15:50:43 +05:30
tests-iot-web-ui	Pom versions updated.	2017-01-24 11:31:16 +05:30
tests-platform	Changing pom versions to match with parent.	2017-01-09 14:06:05 +05:30
tests-ui-integration	Re-Enabling backend integration tests.	2017-01-24 11:21:05 +05:30
pom.xml	Merge branch 'backend-integration'	2017-01-25 15:50:43 +05:30