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

This commit is contained in:
Diego Prado Gesto 2019-03-01 14:54:10 +01:00
commit 0e7127f80b
4 changed files with 7 additions and 2 deletions

View file

@ -42,6 +42,7 @@ ScrollView
}
Rectangle
{
id: installedPlugins
color: "transparent"
width: parent.width
height: childrenRect.height + UM.Theme.getSize("default_margin").width
@ -74,6 +75,7 @@ ScrollView
Rectangle
{
id: installedMaterials
color: "transparent"
width: parent.width
height: childrenRect.height + UM.Theme.getSize("default_margin").width