Skip to content
Snippets Groups Projects
Commit 9d22c368 authored by Fabian Heinrich's avatar Fabian Heinrich
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 102-too-large-number-of-selected-players-does-not-break-the-gui-and-environment

# Conflicts:
#	cooperative_cuisine/environment.py
#	cooperative_cuisine/game_server.py
parents d533db29 eccd9c34
No related branches found
No related tags found
1 merge request!72Resolve "Too large number of selected players does not break the gui and environment"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 496 additions and 849 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment