[geary] (5 commits) Non-fast-forward update to branch wip/christopherdavis/conversation-search-width

[Christopher Davis <christopherdavis src gnome org>]

The branch 'wip/christopherdavis/conversation-search-width' 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:

  a991661... conversation-viewer: set searchentry width to same as inbox

Commits added to the branch:

  de5df79... ui: change conversation menu icon to view-more (*)
  d4436fa... main-toolbar: Use a full-height, splitting separator (*)
  204bf19... Merge branch 'menu-icon-fix' into 'mainline' (*)
  9e44188... Merge branch 'wip/christopherdavis/full-height-separator' i (*)
  54d2ce4... conversation-viewer: set searchentry width to same as inbox

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