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

This commit is contained in:
Jaime van Kessel 2017-12-19 10:40:32 +01:00
commit bc8741ef08
29 changed files with 581 additions and 223 deletions

View file

@ -141,4 +141,4 @@ Column
}
width: base.width
}
}
}