charitha 96bcf74d5c Merge branch 'master' of https://github.com/wso2/product-iot-server into entgra-master ... # Conflicts: # modules/components/org.wso2.iot.core.admin.styles/pom.xml # modules/components/pom.xml # modules/cxf-filters/pom.xml # modules/distribution/pom.xml # modules/distribution/src/assembly/filter.properties # modules/features/org.wso2.iot.core.styles.feature/pom.xml # modules/features/pom.xml # modules/integration/pom.xml # modules/integration/tests-common/integration-common/pom.xml # modules/integration/tests-common/pom.xml # modules/integration/tests-common/web-ui-pages/pom.xml # modules/integration/tests-integration/pom.xml # modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/jmeter/DeviceTypeManagementJMeterTestCase.java # modules/integration/tests-iot-web-ui/pom.xml # modules/p2-profile/analytics-profile/pom.xml # modules/p2-profile/broker-profile/pom.xml # modules/p2-profile/iot-core-profile/pom.xml # modules/p2-profile/pom.xml # modules/scripts/mobile-qsg/pom.xml # modules/scripts/pom.xml # modules/tools/cdmf-devicetype-archetype/pom.xml # modules/tools/pom.xml # pom.xml		2018-11-11 19:55:48 +05:30
..
tests-common	[maven-release-plugin] prepare for next development iteration	2018-10-03 08:45:57 +05:30
tests-integration	Merge branch 'master' of https://github.com/wso2/product-iot-server into entgra-master	2018-11-11 19:55:48 +05:30
tests-iot-web-ui	[maven-release-plugin] prepare for next development iteration	2018-10-03 08:45:57 +05:30
pom.xml	[maven-release-plugin] prepare for next development iteration	2018-10-31 11:24:30 +00:00