[geary: 2/2] Merge branch 'mjog/fix-flatpak-manifest-filename' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit c75e097d263862f26e0d1a05b740b0a6078f79c2
Merge: bb907070 e8c48a9a
Author: Michael Gratton <mike vee net>
Date:   Fri Mar 13 06:31:43 2020 +0000

    Merge branch 'mjog/fix-flatpak-manifest-filename' into 'mainline'
    
    org.gnome.Geary.yml: Rename to org.gnome.Geary.yaml
    
    See merge request GNOME/geary!423

 .gitlab-ci.yml                              | 2 +-
 meson.build                                 | 2 +-
 org.gnome.Geary.json                        | 2 +-
 org.gnome.Geary.yml => org.gnome.Geary.yaml | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
---