mirror of
https://github.com/esphome/esphome.git
synced 2026-10-09 12:26:02 +00:00
Merge branch 'esp32-tracker-retire-scanner-listener' into esp32-hub-devirtualize
# Conflicts: # esphome/components/bluetooth_proxy/bluetooth_proxy.h # esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
This commit is contained in: