mirror of
https://github.com/home-assistant/core.git
synced 2025-07-21 12:17:07 +00:00
Merge branch 'master' into dev
Conflicts: homeassistant/const.py
This commit is contained in:
commit
3dcafafc6a
Conflicts: homeassistant/const.py