Merge branch 'feature_material_marketplace' into feature_cura_package_api

Contributes to CURA-5137
This commit is contained in:
Diego Prado Gesto 2018-04-03 17:13:36 +02:00
commit 007529c9ec
4 changed files with 117 additions and 24 deletions

View file

@ -34,7 +34,7 @@ Window
{
id: mainView
width: parent.width
color: "red"
color: "transparent"
anchors
{
top: topBar.bottom