From 8bfdf647ccdedac7b696ec46a5f61b1249560c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksi=20Ha=CC=88kli?= <aleksi.hakli@iki.fi>
Date: Fri, 13 Apr 2018 14:48:06 +0300
Subject: [PATCH] Bump version to 4.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #326

Signed-off-by: Aleksi Häkli <aleksi.hakli@iki.fi>
---
 CHANGES.txt      | 10 ++++++++++
 axes/__init__.py |  2 +-
 docs/conf.py     |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 08bb3a5..2373fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,16 @@
 Changes
 =======
 
+4.2.0 (2018-04-13)
+------------------
+
+- Add configuration flags for client IP resolving
+  [aleksihakli]
+
+- Add AxesModelBackend authentication backend
+  [markdaviddoff]
+
+
 4.1.0 (2018-02-18)
 ------------------
 
diff --git a/axes/__init__.py b/axes/__init__.py
index 0b77364..cfe5212 100644
--- a/axes/__init__.py
+++ b/axes/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '4.1.0'
+__version__ = '4.2.0'
 
 default_app_config = 'axes.apps.AppConfig'
 
diff --git a/docs/conf.py b/docs/conf.py
index d757a1f..a9dd74f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,9 +56,9 @@ author = 'jazzband'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.0'
+version = '4.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.0'
+release = '4.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.