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	Migrate to generic discovery method (#2271)	2016-06-11 17:43:13 -07:00
command_line.py	Update link to docs	2016-05-05 09:49:52 +02:00
demo.py	…
homematic.py	change autodiscovery	2016-06-25 21:37:51 +02:00
mqtt.py	Move CONF_STATE_TOPIC, CONF_COMMAND_TOPIC and CONF_RETAIN to mqtt component.	2016-04-06 22:51:39 -04:00
rfxtrx.py	Added rfxtrx rollershutter (#2030)	2016-06-02 00:39:58 -07:00
scsgate.py	…
services.yaml	…
wink.py	Wink Rollershutter (#2294)	2016-06-18 09:59:13 -07:00
zwave.py	Zwave fixes. (#2373)	2016-06-25 20:35:36 +02:00