[geary/wip/3.32-ux: 5/5] Merge branch 'master' into 'wip/3.32-ux'

[Michael Gratton <mjog src gnome org>]

commit cf581bc2e73f4a20f515248ec7012d6959a9f597
Merge: a2b2d201 fd43cc4c
Author: Michael Gratton <mike vee net>
Date:   Sun Oct 28 21:27:11 2018 +0000

    Merge branch 'master' into 'wip/3.32-ux'
    
    App menu retirement
    
    See merge request GNOME/geary!61

 src/client/components/main-toolbar.vala | 10 +++----
 ui/gtk/menus.ui                         | 44 -----------------------------
 ui/main-toolbar-menus.ui                | 50 +++++++++++++++++++++++++--------
 ui/main-toolbar.ui                      | 14 ++++-----
 ui/org.gnome.Geary.gresource.xml        |  1 -
 5 files changed, 51 insertions(+), 68 deletions(-)
---