Eduardo 26508cc25c Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/ui/recipe_selection/recipe_selection.py		2024-11-15 11:10:15 +01:00
..
csv_import	st-ten-6 ready for update	2024-11-14 16:45:43 +01:00
instruction_images	new dime	2024-11-11 10:11:24 +01:00
label_designs	labels ptototipi	2024-11-06 11:28:58 +01:00
label_templates	remote fecthing ok on sim	2024-11-08 16:47:25 +01:00
machine_settings	Merge remote-tracking branch 'origin/master'	2024-11-15 11:10:15 +01:00
vision	vision oring tbt	2023-05-02 19:18:58 +02:00
warning_images	fix	2024-06-05 11:20:28 +02:00