[gnome-initial-setup: 3/3] Merge branch 'gsettings-avatar-faces' into 'master'

[Will Thompson <wjt src gnome org>]

commit fc5b848653c85b70d6056b953d6671838f8109ff
Merge: 1525c346 702516fc
Author: Will Thompson <will willthompson co uk>
Date:   Fri Jun 26 10:26:49 2020 +0000

    Merge branch 'gsettings-avatar-faces' into 'master'
    
    account: Use facesdirs setting to override faces
    
    See merge request GNOME/gnome-initial-setup!60

 gnome-initial-setup/meson.build                    |   1 +
 .../pages/account/um-photo-dialog.c                | 122 +++++++++++++++------
 2 files changed, 90 insertions(+), 33 deletions(-)
---