Commits

Kai Diefenbach committed e4d1a29 Merge

Merged 0.6 branch

  • Participants
  • Parent commits f9599d9, 97625b3

Comments (0)

Files changed (3)

 cf01f161a3bba74ffbfb6141258e2071ed51e0d7 0.5.0b6
 d9d0aa82add600978cb81d13630b0610a24e9ae9 0.5.0b7
 404bd356a32cd39930e773fc571c1b9e651deac1 0.6.0b1
+6a101947f4cc8ab18cab35c448adbf7670bc3d78 0.6.0b2
 Changes
 =======
 
+0.6.0 beta 2 (2011-11-21)
+-------------------------
+* Fixed display of portlets (using django-portlets 1.1)
+
 0.6.0 beta 1 (2011-11-19)
 -------------------------
 
 from setuptools import setup, find_packages
 import os
 
-version = '0.6.0b1'
+version = '0.6.0b2'
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.txt')).read()
         'django-lfstheme == 0.6.0b1',
         'django-pagination == 1.0.7',
         'django-paypal == 0.1.2',
-        'django-portlets == 1.0',
+        'django-portlets == 1.1',
         'django-postal == 0.7.7',
         'django-reviews == 0.2.1',
         'django-tagging == 0.3.1',