Merge branch 'main' into feature/main-signup-kakao-gate

# Conflicts: # app/gateway-frontend/src/views/LobbyView.vue
2026-07-26 10:17:37 +00:00
parent a7bb352ba2 bcf1faaba7
commit 6c3a156b84
22 changed files with 2313 additions and 43 deletions
@@ -69,6 +69,7 @@ export interface TurnCommandFixtureRequest {
        messageAfterId?: number;
        generalCooldowns?: GeneralCooldownSelector[];
        nationCooldowns?: NationCooldownSelector[];
+        diplomacyPairs?: Array<{ fromNationId: number; toNationId: number }>;
    };
 }