[recipes: 4/4] Merge branch 'halal' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 8afa2a5e9cdc11e806d845f2b5d8338db0294c18
Merge: 0a35591 e3cc5ac
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Mar 1 10:10:11 2018 +0000

    Merge branch 'halal' into 'master'
    
    Halal
    
    See merge request GNOME/recipes!3

 src/gr-diet-row.c     | 5 +++++
 src/gr-diet.c         | 3 +++
 src/gr-diet.h         | 3 ++-
 src/gr-edit-page.c    | 9 +++++++--
 src/gr-edit-page.ui   | 7 +++++++
 src/gr-query-editor.c | 5 +++++
 src/gr-recipe.c       | 1 +
 7 files changed, 30 insertions(+), 3 deletions(-)
---