device-mgt-plugins/components/device-types
sinthuja 72a60ba7c7 Merge branch 'origin-wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
#	pom.xml
2017-08-29 15:20:29 +05:30
..
androidsense-plugin Merge branch 'origin-wso2-master' 2017-08-29 15:20:29 +05:30
arduino-plugin Merge branch 'origin-wso2-master' 2017-08-29 15:20:29 +05:30
raspberrypi-plugin Merge branch 'origin-wso2-master' 2017-08-29 15:20:29 +05:30
virtual-fire-alarm-plugin Merge branch 'origin-wso2-master' 2017-08-29 15:20:29 +05:30
pom.xml [WSO2 Release] [Jenkins #2887] [Release 4.0.39] prepare for next development iteration 2017-07-23 21:18:50 +05:30