Files
esphome/esphome
J. Nick Koston e5c4b50a1a Merge upstream/dev into integration
Resolved conflicts in:
- esphome/components/fan/fan.cpp: Preserved pointer-based preset mode optimization
- esphome/components/fan/fan_traits.h: Kept cstring include for strcmp
- esphome/components/web_server_idf/web_server_idf.cpp: Kept float_buf_size constant

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-02 19:42:06 -06:00
..
2025-11-02 19:42:06 -06:00