Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu

* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
This commit is contained in:
ChrisTerBeke 2018-11-20 20:48:52 +01:00
commit 4caf770a62
No known key found for this signature in database
GPG key ID: A49F1AB9D7E0C263
2 changed files with 2 additions and 3 deletions

View file

@ -73,7 +73,7 @@ UM.Dialog
{
top: parent.top
left: parent.left
topMargin: UM.Theme.getSize("default_margin")
topMargin: UM.Theme.getSize("default_margin").height
}
text: catalog.i18nc("@title:tab", "Add a printer to Cura")