mirror of
https://github.com/AstrBotDevs/AstrBot
synced 2026-07-15 17:30:13 +08:00
Conflicts resolved: - tests/test_dashboard.py: kept all tests from both sides - astrbot/core/config/default.py: took origin/master mimo-tts hints - astrbot/dashboard/routes/t2i.py: took origin/master _sync_active_template_to_all_configs approach - dashboard/src/views/Settings.vue: took origin/master version