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
..
2022-08-01 10:49:29 +02:00
2022-06-13 15:08:00 +02:00
2021-12-28 14:46:02 +01:00
2022-11-01 16:11:34 +01:00
2022-06-17 15:22:33 +02:00
2021-12-28 14:46:02 +01:00
2021-12-28 14:46:02 +01:00
2021-12-28 14:46:02 +01:00
2021-12-28 14:46:02 +01:00
2022-09-07 15:32:51 +02:00
2022-09-26 10:25:42 +02:00
2022-04-13 16:53:11 +02:00