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

[Matthias Clasen <matthiasc src gnome org>]

commit 916ef485d1b2b92a2082f5771b42ce7aa5b69991
Merge: 0bd5a96d71 92585b75fa
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 15 21:00:44 2020 +0000

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

 demos/gtk-demo/textview.c   |  4 ++--
 gtk/gtkactionmuxer.c        |  6 +++++-
 gtk/gtkactionmuxerprivate.h |  3 ++-
 gtk/gtkemojicompletion.c    |  3 ++-
 gtk/gtkspinbutton.c         | 13 +++++++++----
 gtk/inspector/actions.c     |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)
---