[meld: 2/3] Merge branch 'master' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit 346b672a2c25b66a27e7a909ea2afd8c8ce264a9
Merge: 044d6e83 c76b8899
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Aug 30 21:40:23 2019 +0000

    Merge branch 'master' into 'master'
    
    # Conflicts:
    #   .gitlab-ci.yml

 .gitlab-ci.yml      | 12 +++++++++---
 meld/chunkmap.py    |  2 ++
 meld/iohelpers.py   |  2 +-
 meld/melddoc.py     |  5 +++--
 meld/patchdialog.py |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)
---