Merge with '0.8.1'

Conflicts: README.rst docs/changelog.rst
jazzband · Apr 27, 2015 · bb62289 · bb62289
2 parents fec119f + 44a4157
commit bb62289
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -53,7 +53,7 @@ Install with pip::
 Add `oauth2_provider` to your `INSTALLED_APPS`
 
 .. code-block:: python
-    
+
     INSTALLED_APPS = (
         ...
         'oauth2_provider',
@@ -96,6 +96,11 @@ master branch
 * ``oauthlib_backend_class`` is now pluggable through Django settings
 * #127: ``application/json`` Content-Type is now supported using ``JSONOAuthLibCore``
 
+0.8.1 [2015-04-27]
+~~~~~~~~~~~~~~~~~~
+
+* South migrations fixed. Added new django migrations.
+
 0.8.0 [2015-03-27]
 ~~~~~~~~~~~~~~~~~~
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -7,6 +7,13 @@ master branch
 * ``oauthlib_backend_class`` is now pluggable through Django settings
 * #127: ``application/json`` Content-Type is now supported using ``JSONOAuthLibCore``
 
+
+0.8.1 [2015-04-27]
+------------------
+
+* South migrations fixed. Added new django migrations.
+
+
 0.8.0 [2015-03-27]
 ------------------
 

diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 
 __author__ = "Massimiliano Pippi & Federico Frenguelli"