github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-03 19:46:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source 
# Conflicts:
#	esphome/components/esphome/ota/ota_esphome.h
#	esphome/components/http_request/ota/ota_http_request.cpp
#	esphome/components/http_request/ota/ota_http_request.h
#	esphome/components/ota/ota_backend_factory.h
#	esphome/components/web_server/ota/ota_web_server.cpp
#	esphome/components/wifi/wifi_component.cpp
This commit is contained in:
J. Nick Koston
2026-03-05 10:57:44 -10:00
parent e1fef3aa2a b0be02e16d
commit 21fb5975d6
74 changed files with 865 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/ci-custom.py
+1
View File
@@ -72,6 +72,7 @@ ignore_types = (
".gif",
".webp",
".bin",
".wav",
)
LINT_FILE_CHECKS = []