[hitori: 2/2] Merge branch 'jbicha/hitori-keyboard-shortcuts-dialog' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 22c89bb9b614db0ba7bbb805dd0eb2da01782a1f
Merge: 52811f4 7c6a20b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon May 13 11:46:13 2019 +0000

    Merge branch 'jbicha/hitori-keyboard-shortcuts-dialog' into 'master'
    
    Add Keyboard Shortcuts dialog
    
    See merge request GNOME/hitori!22

 data/help-overlay.ui     | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
 data/hitori.ui           |  4 +++
 meson.build              |  2 +-
 po/POTFILES.in           |  1 +
 src/hitori.gresource.xml |  3 ++
 5 files changed, 82 insertions(+), 1 deletion(-)
---