Support merge_language option.

Closes #84.
This commit is contained in:
medmunds
2015-01-16 13:48:39 -08:00
parent 1c4ee989f7
commit 76e29c0845
4 changed files with 11 additions and 1 deletions

View File

@@ -171,6 +171,13 @@ Most of the options from the Mandrill
.. versionadded:: 0.7
.. attribute:: merge_language
``str``: the merge tag language if using merge tags -- e.g., "mailchimp" or "handlebars".
Default from your Mandrill account settings.
.. versionadded:: 1.3
.. attribute:: global_merge_vars
``dict``: merge variables to use for all recipients (most useful with :ref:`mandrill-templates`). ::