[geary: 2/2] Merge branch 'mjog/flatpak-json-to-yml' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit e589713d4f85dadd817d3c551ac2ce856c89799f
Merge: 91860591 3a93e378
Author: Michael Gratton <mike vee net>
Date:   Thu Sep 26 12:52:11 2019 +0000

    Merge branch 'mjog/flatpak-json-to-yml' into 'mainline'
    
    Convert flatpak-builder manifest from JSON to YAML
    
    See merge request GNOME/geary!314

 .gitlab-ci.yml       |   2 +-
 org.gnome.Geary.json | 240 ---------------------------------------------------
 org.gnome.Geary.yml  | 203 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 204 insertions(+), 241 deletions(-)
---