[meld: 52/52] Merge branch 'flatpak-ci' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit b0e8152c43418b2264391a4bad7dfd2614589d49
Merge: 0041a7d2 ddabed07
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Dec 30 01:58:33 2019 +0000

    Merge branch 'flatpak-ci' into 'master'
    
    Flatpak CI
    
    Closes Initiatives#1
    
    See merge request GNOME/meld!46

 .gitlab-ci.yml                                     |  57 +++++---
 README.md                                          |  86 +++++-------
 bin/meld                                           | 155 ++++++++++++---------
 data/meson.build                                   |  29 +++-
 ...me.meld-devel.json => org.gnome.MeldDevel.json} |  28 ++--
 ...ata.xml.in => org.gnome.meld.appdata.xml.in.in} |   2 +-
 ...eld.desktop.in => org.gnome.meld.desktop.in.in} |   2 +-
 meld/build_helpers.py                              |  14 +-
 meld/{conf.py => conf.py.in}                       |  13 +-
 meld/meldapp.py                                    |  18 ++-
 meld/meldwindow.py                                 |   6 +-
 meld/meson.build                                   |  17 ++-
 meld/misc.py                                       |   3 +-
 meld/resources/ui/about-dialog.ui                  |  30 +---
 meld/resources/ui/appwindow.ui                     |   1 -
 meld/settings.py                                   |   2 +-
 meson.build                                        |  19 ++-
 meson_options.txt                                  |   6 +
 setup.cfg                                          |   2 +-
 setup.py                                           |  16 ++-
 setup_win32.py                                     |  22 ++-
 test/conftest.py                                   |  18 +++
 22 files changed, 324 insertions(+), 222 deletions(-)
---