casper 5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars ... # Conflicts: # plugins/PerObjectSettingsTool/PerObjectItem.qml # plugins/PerObjectSettingsTool/SettingPickDialog.qml		2022-02-18 09:07:25 +01:00
..
fonts	Update fonts using Google Noto Sans Fonts	2020-02-05 11:25:27 +01:00
icons	Merge pull request #11328 from Ultimaker/CURA-8378_improve_checkbox_visibility	2022-02-02 19:54:34 +02:00
images	Add page for when the user has no cloud printers	2021-10-06 16:42:56 +02:00
styles.qml	Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars	2022-02-18 09:07:25 +01:00
theme.json	Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2	2022-02-17 15:02:03 +01:00