Ghostkeeper d42ba9dda0

Merge branch '4.0' ...

Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto

2019-02-15 13:58:47 +01:00

..

cura-dark

Fix sign-in size for cloud icon (and add for dark theme).

2019-02-12 11:57:01 +01:00

cura-light

Merge branch '4.0'

2019-02-15 13:58:47 +01:00