[geary: 2/2] Merge branch 'wip/187-flatpak-ci-wrong-branch' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 07c7150e1472c4091784b444af9121c6510955de
Merge: f80fe6b7 02c60f8d
Author: Michael Gratton <mike vee net>
Date:   Wed Jan 16 00:39:58 2019 +0000

    Merge branch 'wip/187-flatpak-ci-wrong-branch' into 'master'
    
    Import standard GNOME Flatpak CI config rather than copy/pasting it
    
    Closes #187
    
    See merge request GNOME/geary!87

 .gitlab-ci.yml | 105 ++++++++++-----------------------------------------------
 1 file changed, 18 insertions(+), 87 deletions(-)
---