From bcadd81e414aa53ba27dd42030bb85896688dc09 Mon Sep 17 00:00:00 2001
From: Piotr Szpetkowski <piotr.szpetkowski@pyquest.space>
Date: Thu, 1 Feb 2018 22:35:42 +0100
Subject: [PATCH] Release 1.1.1

Update CHANGELOG
---
 CHANGELOG.rst       | 7 +++++++
 docs/source/conf.py | 2 +-
 setup.py            | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 640c80f..5128653 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,13 @@ Change Log
 This document records all notable changes to django-templated-mail.
 This project adheres to `Semantic Versioning <http://semver.org/>`_.
 
+---------------------
+`1.1.1`_ (2017-02-01)
+---------------------
+
+* Bugfix: ``from_email`` does not fallback to ``DEFAULT_FROM_EMAIL``
+
+
 ---------------------
 `1.1.0`_ (2017-01-29)
 ---------------------
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 51ebad6..bbc0eb4 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1'
+release = '1.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index d058da5..cf9b7ea 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def get_packages(package):
 
 setup(
     name='django-templated-mail',
-    version='1.1.0',
+    version='1.1.1',
     packages=get_packages('templated_mail'),
     license='MIT',
     author='Sunscrapers',