github/ha-core
1
Fork 0
mirror of https://github.com/home-assistant/core synced 2024-09-18 19:55:20 +02:00
Code Releases Activity

Merge branch 'master' into dev

Browse Source 
Conflicts:
	homeassistant/components/climate/ecobee.py
	homeassistant/components/cover/wink.py
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen 2016-09-24 01:03:56 -07:00
commit 36921748ed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/cover/wink.py
View File

@ -15,7 +15,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the Wink cover platform."""
import pywink
add_devices(WinkCoverDevice(shade) for shade, door in
add_devices(WinkCoverDevice(shade) for shade in
pywink.get_shades())
add_devices(WinkCoverDevice(door) for door in
pywink.get_garage_doors())