[gnome-software: 3/3] Merge branch '1207-sidebar-categories' into 'master'

[Milan Crha <mcrha src gnome org>]

commit 4f0cf131d59bbb4db06c1e22f099beb773eed351
Merge: b90bb855f 11137cb21
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jul 7 10:22:41 2021 +0000

    Merge branch '1207-sidebar-categories' into 'master'
    
    gs-desktop-data: Condense category list
    
    Closes #1207
    
    See merge request GNOME/gnome-software!813

 lib/gs-desktop-data.c         | 310 +++++++++++++++++-------------------------
 lib/gs-desktop-data.h         |   2 +-
 plugins/dummy/gs-self-test.c  |   2 +-
 plugins/snap/gs-plugin-snap.c |  24 ++--
 src/gs-overview-page.c        |  25 ++--
 5 files changed, 149 insertions(+), 214 deletions(-)
---