Skip to content
Snippets Groups Projects
Commit c74ca561 authored by Florian Schröder's avatar Florian Schröder
Browse files

Merge remote-tracking branch 'origin/main' into 70-trashcan-usage-can-affect-the-score 

# Conflicts:
#	overcooked_simulator/game_server.py
parents b600b39e 610e930e
No related branches found
No related tags found
2 merge requests!36Resolve "Trashcan usage can affect the score",!34Resolve "Counter Factory"
Pipeline #44913 passed
Stage: test