 kbx81
|
6a9791609f
|
Merge branch '20260902-serial-proxy-tap' into 20260218-zigbee-proxy
# Conflicts:
# esphome/components/api/api.proto
# esphome/components/api/api_connection.cpp
# esphome/components/api/api_pb2.h
# esphome/components/api/api_pb2_dump.cpp
# esphome/components/api/api_pb2_service.cpp
# esphome/components/serial_proxy/serial_proxy.cpp
# esphome/components/serial_proxy/serial_proxy.h
|
2026-09-03 19:52:29 -05:00 |
|