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

[Matthias Clasen <matthiasc src gnome org>]

commit ce29545470268f510110a3aec0dfba46a70f8de4
Merge: 6de7022458 cbe3de9ce7
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 1 14:21:34 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3220
    
    See merge request GNOME/gtk!2652

 .gitlab-ci.yml                              |  7 +++----
 .gitlab-ci/fedora-base.Dockerfile           |  2 +-
 .gitlab-ci/fedora-docs.Dockerfile           |  2 +-
 .gitlab-ci/fedora.Dockerfile                |  2 +-
 demos/gtk-demo/demo.gresource.xml           |  2 ++
 demos/gtk-demo/gltransition.c               |  4 ++--
 docs/reference/meson.build                  | 10 +++-------
 gsk/broadway/gskbroadwayrenderer.c          |  4 ++++
 meson.build                                 |  2 +-
 modules/printbackends/gtkprintbackendcups.c |  2 --
 10 files changed, 18 insertions(+), 19 deletions(-)
---