From 19014a72b0a657fc65185cade5cc8c9f9c65c6c0 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 28 May 2014 21:33:17 -0700 Subject: [PATCH] Open v1.2 development [ci skip] --- djrill/_version.py | 2 +- docs/history.rst | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/djrill/_version.py b/djrill/_version.py index adc3729..3fa5cfc 100644 --- a/djrill/_version.py +++ b/djrill/_version.py @@ -1,3 +1,3 @@ -VERSION = (1, 1, 0, 'dev1') # Remove the 'dev1' component in release branches +VERSION = (1, 2, 0, 'dev1') # Remove the 'dev1' component in release branches __version__ = '.'.join([str(x) for x in VERSION]) __minor_version__ = '.'.join([str(x) for x in VERSION[:2]]) # Sphinx's X.Y "version" diff --git a/docs/history.rst b/docs/history.rst index 4b2f2bb..afdc56f 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -1,12 +1,16 @@ Release Notes ============= -Version 1.1 (development): +Version 1.2 (development): + + +Version 1.1: * Allow use of Mandrill template default "from" and "subject" fields, via :attr:`use_template_from` and :attr:`use_template_subject`. * Fix `UnicodeEncodeError` with unicode attachments + Version 1.0: * Global :setting:`MANDRILL_SUBACCOUNT` setting