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

[Matthias Clasen <matthiasc src gnome org>]

commit 42b515a1e5a7e0cdf7806d9b14f0e1af0660aef5
Merge: 50ccab487f 6ab779cd06
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Mar 7 14:59:57 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Revert "flatpak: No need to build sassc anymore"
    
    See merge request GNOME/gtk!3266

 build-aux/flatpak/org.gtk.Demo4.json          | 30 +++++++++++++++++++++++++++
 build-aux/flatpak/org.gtk.IconBrowser4.json   | 30 +++++++++++++++++++++++++++
 build-aux/flatpak/org.gtk.WidgetFactory4.json | 30 +++++++++++++++++++++++++++
 gsk/gskroundedrect.c                          |  9 ++------
 4 files changed, 92 insertions(+), 7 deletions(-)
---