Lipu Fei f7fb04d4ae Fix merge conflicts with 4.0		2019-01-03 15:25:40 +01:00
..
fonts	CURA-4790 Change font to Noto Sans	2018-02-08 17:23:14 +01:00
icons	Merge pull request #4976 from Ultimaker/CURA-6013-rate-packages	2018-12-17 08:32:18 +01:00
images	Add a placeholder for a pattern in the header, if the theme wants to add one.	2018-12-18 10:29:44 +01:00
styles.qml	Fix merge conflicts with 4.0	2019-01-03 15:25:40 +01:00
theme.json	Merge branch '4.0' into unify_font_types	2019-01-03 10:46:49 +01:00