[geary: 2/2] Merge branch 'wip/236-return-of-the-menubar' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 963882d816e128db9eb03409d1ba640c8a66d238
Merge: 6e5d85a3 b69fec86
Author: Michael Gratton <mike vee net>
Date:   Tue Feb 19 03:18:25 2019 +0000

    Merge branch 'wip/236-return-of-the-menubar' into 'master'
    
    Fix the MainWindow's menu bar showing up again
    
    Closes #236
    
    See merge request GNOME/geary!115

 src/client/components/main-window.vala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---