[geary] (15 commits) Non-fast-forward update to branch mjog/email-templates

[Michael Gratton <mjog src gnome org>]

The branch 'mjog/email-templates' 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:

  53de3b8... Application.Controller, Composer.Widget: Clean up composer 
  f2ee824... ConversationListBox: Remove obsolete action and signal
  002db96... Composer.Widget: Convert to using AccountContext objects
  7b9b2c8... Composer.Widget: Re-load a context email with missing field
  a42ad40... Application.{Controller,MainWindow}: Clean up displaying co
  1742a08... Application.MainWindow: Email not found error when discardi
  f7dda5a... ConversationViewer: Avoid re-enabling kinetic scrolling if 
  00d7d3b... Plugin.Composer: Add support for editing an email in the co
  8ca3de0... Plugins.SpecialFolders: Actually implement the edit draft a
  2716b2e... Geary.App.DraftManaager: Update API to something more RAII-
  46fb6c4... Application.Controller: Allow creating composers with alt s
  db494fb... Plugin.InfoBar: Allow secondary buttons to be specified.
  9a4a0e7... Plugin.Composer: Support specifying a folder to save email
  1502558... Plugins: Add EmailTemplate plugin

Commits added to the branch:

  aac59ec... Application.Controller, Composer.Widget: Clean up composer 
  96ddd5a... ConversationListBox: Remove obsolete action and signal
  fc4bc92... Composer.Widget: Convert to using AccountContext objects
  6a33266... Composer.Widget: Re-load a context email with missing field
  a67f1b2... Application.{Controller,MainWindow}: Clean up displaying co
  480277e... Application.MainWindow: Email not found error when discardi
  2cd43de... ConversationViewer: Avoid re-enabling kinetic scrolling if 
  6fd3f36... Plugin.Composer: Add support for editing an email in the co
  924231d... Plugins.SpecialFolders: Actually implement the edit draft a
  b20af44... Geary.App.DraftManaager: Update API to something more RAII-
  c86fdf1... Application.Controller: Allow creating composers with alt s
  786c4c2... Plugin.InfoBar: Allow secondary buttons to be specified.
  a576b78... Plugin.Composer: Support specifying a folder to save email
  216f0d8... Plugin.Composer: Support disabling sending a composer
  76992e2... Plugins: Add EmailTemplate plugin