Merge remote-tracking branch 'upstream/dev' into nest_sensor

# Conflicts:
#	.coveragerc
#	requirements_all.txt
This commit is contained in:
Joseph Hughes committed 2016-01-15 08:18:16 -07:00
commit 80023f62d9
12 files changed
+223 -13

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ import logging
from homeassistant.helpers.entity import Entity
from homeassistant.const import CONF_ACCESS_TOKEN, STATE_OPEN, STATE_CLOSED
REQUIREMENTS = ['python-wink==0.3.1']
REQUIREMENTS = ['python-wink==0.4.1']
def setup_platform(hass, config, add_devices, discovery_info=None):