[recipes] (8 commits) Non-fast-forward update to branch wip/yield

[Matthias Clasen <matthiasc src gnome org>]

The branch 'wip/yield' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  0ba22c5... details, edit: rename serves to yield
  c1d7b04... Add yield information to GrRecipe
  1472204... Make the yield unit editable
  c0a0ba3... Use the yield language in the shopping page
  41c46cb... Fix a mismerge
  33a4bbe... Update expected number test results

Commits added to the branch:

  f961501... Fix a mismerge (*)
  3394077... Update expected number test results (*)
  9d642c6... details, edit: rename serves to yield
  a2bb227... Add yield information to GrRecipe
  6bf88fe... Make the yield unit editable
  ef1456f... Use the yield language in the shopping page
  6e5fe98... wip: add a yield and yield-unit
  bd0c845... Complete conversion to yields

(*) This commit already existed in another branch; no separate mail sent