From 3f7be234706070b4c943aed341b060fe3131fcab Mon Sep 17 00:00:00 2001
From: "fang.li" <fang.li@funplus.com>
Date: Wed, 14 Mar 2018 11:14:04 -0700
Subject: [PATCH] Merged PRs and did some cleaning

---
 AUTHORS.rst | 2 ++
 README.rst  | 4 +++-
 setup.py    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 680173a..61740b3 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -25,3 +25,5 @@ Contributors
 - `Terry <https://github.com/tpeng>`_
 - `Tim Pierce <https://github.com/qwrrty/>`_ (Adobe Systems)
 - `Tonymke <https://github.com/tonymke/>`_
+- `pintor <https://github.com/pintor>`_
+- `BaconAndEggs <https://github.com/BaconAndEggs>`_
diff --git a/README.rst b/README.rst
index b54ab69..a3872e7 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ Django SAML2 Authentication Made Easy
 =====================================
 
 :Author: Fang Li
-:Version: Use 1.1.4 for Django <=1.9 and 2.x.x for Django >= 1.8
+:Version: Use 1.1.4 for Django <=1.9 and 2.x.x for Django >= 1.9
 
 .. image:: https://img.shields.io/pypi/pyversions/django-saml2-auth.svg
     :target: https://pypi.python.org/pypi/django-saml2-auth
@@ -250,6 +250,8 @@ How to Contribute
 Release Log
 ===========
 
+2.2.0: ADFS SAML compatibility and fixed some issue for Django2.0
+
 2.1.2: Merged #35
 
 2.1.1: Added ASSERTION_URL in settings.
diff --git a/setup.py b/setup.py
index 7ce331a..a77ab10 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 setup(
     name='django_saml2_auth',
 
-    version='2.1.2',
+    version='2.2.0',
 
     description='Django SAML2 Authentication Made Easy. Easily integrate with SAML2 SSO identity providers like Okta',
     long_description=long_description,