[gnome-initial-setup: 2/2] Merge branch '61-cheesecameradevicemonitor-may-hang-account-page-during-initialization' into 'master

[Ondrej Holy <oholy src gnome org>]

commit eb180a6f5ed211b2dbf649c34e7d00bf8e0ba9c0
Merge: 1d381c5 09ba650
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Jan 20 10:35:33 2020 +0000

    Merge branch '61-cheesecameradevicemonitor-may-hang-account-page-during-initialization' into 'master'
    
    account: Prevent freeze caused by CheeseCameraDeviceMonitor
    
    Closes #61
    
    See merge request GNOME/gnome-initial-setup!68

 .../pages/account/um-photo-dialog.c                | 41 +++++++++++++++++-----
 meson.build                                        |  2 +-
 2 files changed, 34 insertions(+), 9 deletions(-)
---