[geary: 2/2] Merge branch 'mjog/1004-missing-labels' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit d3badedad7e3f89e446d31fe628f08cb07063b3f
Merge: 151f5ee66 bfbc7f5d7
Author: Michael Gratton <mike vee net>
Date:   Tue Sep 29 22:35:03 2020 +0000

    Merge branch 'mjog/1004-missing-labels' into 'mainline'
    
    client: Fix not all folders being displayed in additional main windows
    
    Closes #1004
    
    See merge request GNOME/geary!594

 src/client/application/application-folder-context.vala | 7 ++++++-
 src/client/application/application-main-window.vala    | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
---