mirror of
https://github.com/esphome/esphome.git
synced 2026-03-01 02:14:19 -07:00
Merge remote-tracking branch 'upstream/dev' into integration
# Conflicts: # esphome/components/http_request/http_request.h # esphome/components/http_request/http_request_arduino.cpp # esphome/components/http_request/http_request_arduino.h # esphome/components/http_request/http_request_host.cpp # esphome/components/http_request/http_request_host.h # esphome/components/http_request/http_request_idf.cpp # esphome/components/http_request/http_request_idf.h # esphome/core/component.cpp
This commit is contained in: