Skip to content
Snippets Groups Projects
Commit e4d3b25f authored by Pascal Vizeli's avatar Pascal Vizeli
Browse files

Merge remote-tracking branch 'refs/remotes/home-assistant/dev' into Homematic

# Conflicts:
#	homeassistant/components/thermostat/homematic.py
parents e0e9d3c5 21381a95
No related branches found
No related tags found
No related merge requests found
Showing
with 551 additions and 21 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment