Jason Woltje cf28efa880 merge: resolve conflicts with develop (M10-Telemetry + M12-MatrixBridge) ...

Merge origin/develop into feature/m13-speech-services to incorporate
M10-Telemetry and M12-MatrixBridge changes. Resolved 4 conflicts:
- .env.example: Added speech config alongside telemetry + matrix config
- Makefile: Added speech targets alongside matrix targets
- app.module.ts: Import both MosaicTelemetryModule and SpeechModule
- docs/tasks.md: Combined all milestone task tracking sections

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

2026-02-15 12:31:08 -06:00

3.9 KiB

Raw Blame History

View Raw