[geary] (5 commits) Non-fast-forward update to branch wip/778025-conversation-height-0.12

[Michael Gratton <mjog src gnome org>]

The branch 'wip/778025-conversation-height-0.12' 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:

  f060ec8... Take zoom level into account when determining preferred hei
  d2a3551... Check for ClientWebView preferred height changing in a few 
  b23a67f... Use doc element's scrollHeight as ClientWebView's preferred

Commits added to the branch:

  008ff89... Adjust conversation height dynamically when zooming (*)
  8af7821... Revert "Adjust conversation height dynamically when zooming (*)
  bdfaff2... Take zoom level into account when determining preferred hei
  ab479b6... Check for ClientWebView preferred height changing in a few 
  721c594... Use doc element's scrollHeight as ClientWebView's preferred

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