Pascal Vizeli e4d3b25f1e Merge remote-tracking branch 'refs/remotes/home-assistant/dev' into Homematic ... # Conflicts: # homeassistant/components/thermostat/homematic.py		2016-06-25 22:02:14 +02:00
..
__init__.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
demo.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
ecobee.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
eq3btsmart.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
heat_control.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
heatmiser.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
homematic.py	change autodiscovery	2016-06-25 21:37:51 +02:00
honeywell.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
nest.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
proliphix.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
radiotherm.py	ABC consistent not implemented behavior (#2359)	2016-06-24 21:27:40 -07:00
services.yaml	add fan_min_on_time service to ecobee (#2159)	2016-06-09 23:34:29 -07:00
zwave.py	Fix physical manual update of state of device (#2372)	2016-06-24 23:22:14 -07:00