Merge branch 'release/1.0' into develop

This commit is contained in:
Jannis Leidel
2011-09-07 14:03:27 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1,2 +1,2 @@
# following PEP 386, versiontools will pick it up
__version__ = (1, 0, 0, "alpha", 1)
__version__ = (1, 0, 0, "final", 0)

View File

@@ -48,9 +48,9 @@ copyright = u'2011, Django Compressor authors'
# built documents.
#
# The short X.Y version.
version = '0.9'
version = '1.0'
# The full version, including alpha/beta/rc tags.
release = '0.9.2'
release = '1.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.