mirror of
https://github.com/home-assistant/core.git
synced 2025-07-10 06:47:09 +00:00
Merge branch 'master' into dev
Conflicts: homeassistant/const.py
This commit is contained in:
commit
c10a86d1bf
Conflicts: homeassistant/const.py