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

Merge remote-tracking branch 'origin/dev' into 105-configure-displayed-language

# Conflicts:
#	cooperative_cuisine/pygame_2d_vis/gui.py
#	cooperative_cuisine/pygame_2d_vis/visualization.yaml
parents c2bd6138 0e287385
No related branches found
No related tags found
1 merge request!80Resolve "Configure displayed language"
Pipeline #48664 passed
Showing
with 828 additions and 321 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment