Merge remote-tracking branch 'origin/dev' into dev
Conflicts: homeassistant/components/script.py homeassistant/helpers/entity_component.py
This commit is contained in:
commit
f74a6ed4c9
Conflicts: homeassistant/components/script.py homeassistant/helpers/entity_component.py