Merge branch 'main' into feature/auction-menu-parity
# Conflicts: # app/game-frontend/e2e/playwright.config.mjs # app/game-frontend/package.json # app/gateway-api/src/adminRouter.ts # app/gateway-api/src/lobby/profileStatusService.ts # app/gateway-api/src/orchestrator/gatewayOrchestrator.ts # app/gateway-api/test/orchestratorOperations.test.ts # app/gateway-api/test/orchestratorPlan.test.ts # app/gateway-frontend/e2e/server-operations.spec.ts # app/gateway-frontend/src/views/AdminView.vue # app/gateway-frontend/src/views/ServerOperationsView.vue
This commit is contained in:
commit
a3fc1b5ebd
27 files changed
+1213
-192
No files matched your search
@@ -818,6 +818,7 @@ export const adminRouter = router({
|
||||
apiRunning: false,
|
||||
daemonRunning: false,
|
||||
auctionRunning: false,
|
||||
battleSimRunning: false,
|
||||
tournamentRunning: false,
|
||||
},
|
||||
}));
|
||||
|
||||
Reference in new issue
Block a user