[gtk: 4/4] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit ae7fd6f12984e579464d276abe085e5ba3ce6f98
Merge: ba1633ce75 99d7130da3
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 25 19:26:36 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!1761

 gtk/gtkfixedlayout.c                               | 25 ++++++++++++++++------
 .../reftests/background-image-multiple.ref.ui      | 20 ++++-------------
 testsuite/reftests/meson.build                     |  1 -
 3 files changed, 23 insertions(+), 23 deletions(-)
---