[geary: 2/2] Merge branch 'wip/shortcut-conflicts' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 5ad03550c7df1e0b6b82eb419f1eb03d089b6e6f
Merge: 90016b8a 2f36221b
Author: Michael Gratton <mike vee net>
Date:   Sun Aug 18 11:39:09 2019 +0000

    Merge branch 'wip/shortcut-conflicts' into 'mainline'
    
    Fix conflicting keyboard shortcuts and update overlay
    
    See merge request GNOME/geary!288

 src/client/application/application-controller.vala | 31 +++++++++++++++-------
 ui/gtk/help-overlay.ui                             | 16 +++++------
 2 files changed, 30 insertions(+), 17 deletions(-)
---