mirror of
https://github.com/esphome/esphome.git
synced 2026-02-18 15:35:59 -07:00
# Conflicts: # esphome/components/fan/fan_traits.h # esphome/components/http_request/ota/ota_http_request.cpp # tests/integration/test_alarm_control_panel_state_transitions.py