From 9faf0a102edaed31c0901b93d7949040b1454a33 Mon Sep 17 00:00:00 2001
From: Daniel Quinn <code@danielquinn.org>
Date: Sun, 21 Jan 2018 17:39:00 +0000
Subject: [PATCH] Update changelog & version bump

---
 docs/changelog.rst       | 13 +++++++++++++
 src/paperless/version.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4d7e41ef2..1c0fe3860 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,14 @@
 Changelog
 #########
 
+* 1.1.0
+  * Fix for `#283`_, a redirect bug which broke interactions with
+    paperless-desktop.  Thanks to `chris-aeviator`_ for reporting it.
+  * Addition of an optional new financial year filter, courtesy of
+    `David Martin`_ `#256`_
+  * Fixed a typo in how thumbnails were named in exports `#285`_, courtesy of
+    `Dan Panzarella`_
+
 * 1.0.0
   * Upgrade to Django 1.11.  **You'll need to run
     ``pip install -r requirements.txt`` after the usual ``git pull`` to
@@ -258,6 +266,8 @@ Changelog
 .. _Stefan Hagen: https://github.com/xkpd3
 .. _dev-rke: https://github.com/dev-rke
 .. _Lukas Winkler: https://github.com/Findus23
+.. _chris-aeviator: https://github.com/chris-aeviator
+.. _Dan Panzarella: https://github.com/pzl
 
 .. _#20: https://github.com/danielquinn/paperless/issues/20
 .. _#44: https://github.com/danielquinn/paperless/issues/44
@@ -304,3 +314,6 @@ Changelog
 .. _#272: https://github.com/danielquinn/paperless/issues/272
 .. _#248: https://github.com/danielquinn/paperless/issues/248
 .. _#278: https://github.com/danielquinn/paperless/issues/248
+.. _#283: https://github.com/danielquinn/paperless/issues/283
+.. _#256: https://github.com/danielquinn/paperless/pull/256
+.. _#285: https://github.com/danielquinn/paperless/pull/285
diff --git a/src/paperless/version.py b/src/paperless/version.py
index 8dcd08521..37a1329f2 100644
--- a/src/paperless/version.py
+++ b/src/paperless/version.py
@@ -1 +1 @@
-__version__ = (1, 0, 0)
+__version__ = (1, 1, 0)