You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Shabirmean f0b12bab62 Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1 ... Conflicts: components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/util/ArduinoServiceUtils.java features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs		9 years ago
..
agent	Files update	9 years ago
configs	digital_display.json added	9 years ago
datasources	Update digital display related files	9 years ago
dbscripts	Update digital display related files	9 years ago
jaggeryapps/devicemgt/app/units	Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1	9 years ago
build.properties	Files update	9 years ago
p2.inf	digital_display.json added	9 years ago