Merge branch 'staging'

Browse Source

# Conflicts:
#	devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy
#	devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
#	devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

...

This commit is contained in:

Vinay Rao

2016-08-23 14:50:39 -07:00

parent 1ec110155d 555edf623a

commit 17014dd248

9 changed files with 815 additions and 351 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

897

smartapps/smartthings/hue-connect.src/hue-connect.groovy

File diff suppressed because it is too large Load Diff