Merge branch 'aladagemre-master'

bread-and-pepper · May 15, 2012 · dee2914 · dee2914
2 parents f96cdfe + c8d70df
commit dee2914
Show file tree

Hide file tree

Showing 14 changed files with 894 additions and 61 deletions.
diff --git a/TODO b/TODO
diff --git a/UPDATES b/UPDATES
@@ -1,5 +1,9 @@
 This file contains all the backwards-incompatible changes.
 
+Version 1.1
+
+- Userena now requires Django >= 1.3 because of the use of class based views.
+
 Version 1.0.1
 
 - Removed the ``user`` relationship outside ``UserenaBaseProfile`` model. This

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
       packages = find_packages(exclude=['demo_project', 'demo_project.*']),
       include_package_data=True,
       install_requires = [
-        'Django>=1.2.1',
+        'Django>=1.3.1',
         'easy_thumbnails',
         'django-guardian>=0.1.0',
         ### Required to build documentation

diff --git a/userena/__init__.py b/userena/__init__.py
@@ -2,7 +2,7 @@
 Django accounts management made easy.
 
 """
-VERSION = (1, 0, 2)
+VERSION = (1, 1, 0)
 
 __version__ = '.'.join((str(each) for each in VERSION[:4]))