merge: resolve conflicts with develop (M10-Telemetry + M12-MatrixBridge)
All checks were successful
All checks were successful
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>
This commit is contained in:
@@ -37,6 +37,7 @@ import { JobStepsModule } from "./job-steps/job-steps.module";
|
||||
import { CoordinatorIntegrationModule } from "./coordinator-integration/coordinator-integration.module";
|
||||
import { FederationModule } from "./federation/federation.module";
|
||||
import { CredentialsModule } from "./credentials/credentials.module";
|
||||
import { MosaicTelemetryModule } from "./mosaic-telemetry";
|
||||
import { SpeechModule } from "./speech/speech.module";
|
||||
import { RlsContextInterceptor } from "./common/interceptors/rls-context.interceptor";
|
||||
|
||||
@@ -98,6 +99,7 @@ import { RlsContextInterceptor } from "./common/interceptors/rls-context.interce
|
||||
CoordinatorIntegrationModule,
|
||||
FederationModule,
|
||||
CredentialsModule,
|
||||
MosaicTelemetryModule,
|
||||
SpeechModule,
|
||||
],
|
||||
controllers: [AppController, CsrfController],
|
||||
|
||||
Reference in New Issue
Block a user