Lipu Fei a85f2ce156 Fix merge conflicts

2019-03-26 09:01:01 +01:00

..

fonts

CURA-4790 Change font to Noto Sans

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

icons

Merge branch '4.0' of github.com:Ultimaker/Cura

2019-02-14 10:53:01 +01:00

images

Remove tiny lines in ultimaker_cloud svg

2019-03-26 08:49:25 +01:00

styles.qml

Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin

2019-01-10 14:58:00 +01:00

theme.json

Fix merge conflicts

2019-03-22 12:07:59 +01:00