[geary/gnome-3-36: 2/2] Merge branch 'cherry-pick-904f08e3' into 'gnome-3-36'

[Michael Gratton <mjog src gnome org>]

commit 9404d1e46c5f541e041bb8cc3b900ee23579fbd1
Merge: f78f253d 55ed9f57
Author: Michael Gratton <mike vee net>
Date:   Wed Mar 25 04:05:21 2020 +0000

    Merge branch 'cherry-pick-904f08e3' into 'gnome-3-36'
    
    Merge branch 'mjog/735-unicode-avatar-initials' into 'gnome-3-36'
    
    See merge request GNOME/geary!444

 src/client/util/util-avatar.vala       | 6 +++---
 test/client/util/util-avatar-test.vala | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
---