Merge remote-tracking branch 'origin/dev' into esp32-gatt-backend

Browse Source

# Conflicts:
#	esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
#	esphome/components/bluetooth_proxy/bluetooth_proxy.h
#	esphome/core/defines.h

...

This commit is contained in:

J. Nick Koston

2026-08-09 08:59:12 -05:00

parent 93124f1f1f e9f428983e

commit 54c50c07c5

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