Merge branch 'hotfix/v0.10-hf1'

2011-12-05 14:42:05 -04:00
parent 4511dc8baf 52a8fca5d9
commit 0d3d6f75b1
5 changed files with 13 additions and 4 deletions
--- a/apps/main/init.py
+++ b/apps/main/init.py
@@ -21,7 +21,7 @@ admin_site = {'text': _(u'admin site'), 'view': 'admin:index', 'famfam': 'keyboa
 __version_info__ = {
    'major': 0,
    'minor': 10,
-    'micro': 0,
+    'micro': 1,
    'releaselevel': 'final',
    'serial': 0
 }
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,3 +1,12 @@
+Version 0.10.1
+--------------
+* Upgraded django-compressor to version 1.1.1, run::
+
+  $ pip install --upgrade -r requirements/production.txt
+
+  to upgrade
+
+
 Version 0.10
 ------------
 * Added a proper setup views for the document grouping functionality.
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,7 +48,7 @@ copyright = u'2011, Roberto Rosario'
 # built documents.
 #
 # The short X.Y version.
-version = '0.10'
+version = '0.10.1'

 # The full version, including alpha/beta/rc tags.
 release = '0.10'
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -16,6 +16,6 @@ pdfminer==20110227
 APScheduler==2.0.2
 Pillow==1.7.4
 cssmin==0.1.4
-django-compressor==1.1
+django-compressor==1.1.1
 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
 djangorestframework==0.2.3
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -13,6 +13,6 @@ pdfminer==20110227
 APScheduler==2.0.2
 Pillow==1.7.4
 cssmin==0.1.4
-django-compressor==1.1
+django-compressor==1.1.1
 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile
 djangorestframework==0.2.3