Merge branch '4.7'

This commit is contained in:
Ghostkeeper 2020-08-11 13:30:09 +02:00
commit c49056f319
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 4 additions and 4 deletions

View file

@ -282,12 +282,13 @@ Item
enabled: !cameraButton.enabled
}
/* //Warning message is commented out because it's factually incorrect. Fix CURA-7637 to allow camera connections via cloud.
MonitorInfoBlurb
{
id: cameraDisabledInfo
text: catalog.i18nc("@info", "The webcam is not available because you are monitoring a cloud printer.")
target: cameraButton
}
}*/
}
// Divider