[gnome-characters: 2/2] Merge branch 'bilelmoussaoui/shortcuts' into 'master'

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit ce66706f2e87166b456f09fe335852b260655ded
Merge: b19fb23 fdddcd0
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sun Feb 21 10:03:26 2021 +0000

    Merge branch 'bilelmoussaoui/shortcuts' into 'master'
    
    Add a shortcuts dialog
    
    See merge request GNOME/gnome-characters!55

 data/mainwindow.ui                           |  1 +
 data/org.gnome.Characters.data.gresource.xml |  1 +
 data/shortcuts.ui                            | 47 ++++++++++++++++++++++++++++
 po/POTFILES.in                               |  1 +
 src/main.js                                  |  3 ++
 src/window.js                                | 18 +++++++++--
 6 files changed, 68 insertions(+), 3 deletions(-)
---