[meld: 5/5] Merge branch 'ci-fixes' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit 943576bf109a5586af3f6ebc302164f14650fb19
Merge: 8e444e14 1b508ddc
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Aug 6 07:22:15 2022 +0000

    Merge branch 'ci-fixes' into 'master'
    
    Fix CI for new Fedora test/lint base
    
    See merge request GNOME/meld!87

 .gitlab-ci.yml       |  2 +-
 dev-requirements.txt | 16 ++++++++--------
 meld/filediff.py     |  8 ++++++--
 3 files changed, 15 insertions(+), 11 deletions(-)
---