[gnome-software: 2/2] Merge branch 'json-flatpak-manifest' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 6ba4920f9fe9bce5fc2337cf25ab6527e5cb35cc
Merge: 437f51b3b 0ea65e799
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Apr 28 13:17:06 2021 +0000

    Merge branch 'json-flatpak-manifest' into 'master'
    
    Convert flatpak-builder manifest to JSON
    
    See merge request GNOME/gnome-software!720

 .gitlab-ci.yml                       |   2 +-
 contrib/org.gnome.SoftwareDevel.json | 210 +++++++++++++++++++++++++++++++++++
 contrib/org.gnome.SoftwareDevel.yml  | 145 ------------------------
 3 files changed, 211 insertions(+), 146 deletions(-)
---