Jelle Spijker 22134f2d3c
Merge branch '5.4' into CURA-9709_custom_icons_with_profiles
# Conflicts:
#	cura/Machines/Models/IntentSelectionModel.py
2023-06-07 16:20:48 +02:00
..
2023-03-07 10:29:37 +01:00
2023-03-15 18:18:31 +01:00
2023-05-05 10:43:26 +02:00
2023-03-08 16:23:56 +01:00
2022-04-05 15:04:35 +02:00
2021-09-07 11:33:54 -04:00
2022-05-11 17:23:54 +02:00
2022-12-12 11:44:21 +01:00