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

[Matthias Clasen <matthiasc src gnome org>]

commit 35c3a60c080db51e76681d490714dd531804ea80
Merge: a1e21c1acb cf1ed3a72a
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Sep 17 03:41:32 2020 +0000

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

 demos/gtk-demo/hypertext.c | 139 ++++++++++++++++++++++++++++++++++++++-------
 demos/gtk-demo/markup.c    |   4 +-
 gtk/gtkshow.c              |   2 +
 gtk/gtktextchild.c         |   4 +-
 gtk/gtktextview.c          |   4 +-
 5 files changed, 125 insertions(+), 28 deletions(-)
---