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

# Conflicts:
#	app/gateway-frontend/src/views/LobbyView.vue

tools/integration-tests/src/turn-differential/coreCommandTrace.ts

@@ -69,6 +69,7 @@ export interface TurnCommandFixtureRequest {
         messageAfterId?: number;
         generalCooldowns?: GeneralCooldownSelector[];
         nationCooldowns?: NationCooldownSelector[];
+        diplomacyPairs?: Array<{ fromNationId: number; toNationId: number }>;
     };
 }