Skip to content
Snippets Groups Projects
Commit c2d9a8ed authored by Florian Schröder's avatar Florian Schröder
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/study_server.py
parents d3259eff e8585344
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"
Pipeline #47845 passed