Permalink
Browse files

Merge branch 'release/0.6b5'

  • Loading branch information...
2 parents 574c7cd + 4bd1d23 commit b05251991132ace82fb10295b55ff9a8cc3fae89 @jezdez jezdez committed Mar 16, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 compressor/__init__.py
  2. +1 −1 compressor/finders.py
  3. +1 −1 docs/conf.py
@@ -1,4 +1,4 @@
-VERSION = (0, 6, 0, "b", 4) # following PEP 386
+VERSION = (0, 6, 0, "b", 5) # following PEP 386
DEV_N = None
@@ -6,7 +6,7 @@
if "django.contrib.staticfiles" in settings.INSTALLED_APPS:
from django.contrib.staticfiles.finders import BaseStorageFinder
elif "staticfiles" in settings.INSTALLED_APPS:
- from staticfiles import BaseStorageFinder
+ from staticfiles.finders import BaseStorageFinder
else:
raise ImproperlyConfigured("When using the compressor staticfiles finder"
"either django.contrib.staticfiles or the "
View
@@ -50,7 +50,7 @@
# The short X.Y version.
version = '0.6'
# The full version, including alpha/beta/rc tags.
-release = '0.6b4'
+release = '0.6b5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

0 comments on commit b052519

Please sign in to comment.