From b9b948c77675baa86b0290a44d4008431d1ca57c Mon Sep 17 00:00:00 2001
From: Camilo Nova <camilo.nova@axiacore.com>
Date: Fri, 10 Jun 2016 17:03:25 -0500
Subject: [PATCH] Release 1.7.0

---
 CHANGES.txt | 25 +++++++++++++++++++++++++
 setup.py    |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5025ed3..648a4ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,31 @@
 Changes
 =======
 
+1.7.0 (2016-06-10)
+------------------
+
+- Use render shortcut for rendering LOCKOUT_TEMPLATE
+  [Radosław Luter]
+
+- Added app_label for RemovedInDjango19Warning
+  [yograterol]
+
+- Add iso8601 translator.
+  [mullakhmetov]
+
+- Edit json response. Context now contains ISO 8601 formatted cooloff time
+  [mullakhmetov]
+
+- Add json response and iso8601 tests.
+  [mullakhmetov]
+
+- Fixes issue 162: UnicodeDecodeError on pip install
+  [joeribekker]
+
+- Added AXES_NEVER_LOCKOUT_WHITELIST option to prevent certain IPs from being locked out.
+  [joeribekker]
+
+
 1.6.1 (2016-05-13)
 ------------------
 
diff --git a/setup.py b/setup.py
index 8551fe1..8fd6693 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ import os
 import codecs
 from setuptools import setup, find_packages
 
-VERSION = '1.6.1'
+VERSION = '1.7.0'
 
 setup(
     name='django-axes',