mirror of
https://github.com/esphome/esphome.git
synced 2026-08-26 16:10:29 +00:00
# Conflicts: # esphome/components/ble_device_base/ble_hub.h # esphome/components/bluetooth_proxy/__init__.py # esphome/components/bluetooth_proxy/bluetooth_proxy.cpp # esphome/components/bluetooth_proxy/bluetooth_proxy.h # esphome/components/esp32_ble_tracker/esp32_ble_tracker.h