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

[Matthias Clasen <matthiasc src gnome org>]

commit 1b7fb10361790a66d2a17329e79a48144188039f
Merge: f6b66881868 3f2d44d517d
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 4 16:32:21 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    gtk-demo: Allow editing in the settings demo
    
    See merge request GNOME/gtk!2033

 demos/gtk-demo/listview_settings.c  | 38 +++++++++++++++++++++++++++++++++++++
 demos/gtk-demo/listview_settings.ui |  5 +++--
 2 files changed, 41 insertions(+), 2 deletions(-)
---