Merge remote-tracking branch 'origin/integration' into integration

Browse Source

# Conflicts:
#	esphome/components/api/proto.cpp
#	esphome/components/api/proto.h

...

This commit is contained in:

J. Nick Koston

2026-03-06 14:28:13 -10:00

parent 8f7c34c502 a1c3129f9b

commit 80d3c9a1d6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available