Diego Prado Gesto 26be65e405 Fix some other merge conflicts ...

Contributes to CURA-6008.

2018-12-07 13:29:16 +01:00

..

fonts

CURA-4790 Change font to Noto Sans

2018-02-08 17:23:14 +01:00

icons

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

2018-12-04 09:23:00 +01:00

images

Fix the color and proportions of the cura logo in the about panel

2018-12-06 11:57:55 +01:00

styles.qml

Clean up the code

2018-12-07 12:07:41 +01:00

theme.json

Fix some other merge conflicts

2018-12-07 13:29:16 +01:00