[gtk: 7/7] Merge branch 'arnaudb/better-substitution' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit e3dba28666aba85ec9d82331af99b611d3fc17fe
Merge: 88aa548965 926fb208ba
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 12 22:53:54 2020 +0000

    Merge branch 'arnaudb/better-substitution' into 'master'
    
    Fix some gtk-builder-tool substitutions.
    
    See merge request GNOME/gtk!1675

 gtk/tools/gtk-builder-tool-simplify.c                 | 19 +++++++++++--------
 testsuite/tools/simplify-data-3to4/grid.expected      |  6 +++---
 .../tools/simplify-data-3to4/office-runner.expected   |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)
---