Merge branch 'release/1.0.2' into develop

* release/1.0.2:
  Fixing some reST syntax.
  Bumping version numbers.
This commit is contained in:
Bryan Veloso 2011-11-03 14:20:01 +09:00
commit 2cb8d5d407
3 changed files with 4 additions and 4 deletions

View file

@ -16,7 +16,7 @@ v1.0.2
v1.0.1
------
- Minor fixes related to the rendering of `README.rst` as a reStructured
- Minor fixes related to the rendering of ``README.rst`` as a reStructured
text file.
- Fixed the included admin template not being found when ImageKit was and

View file

@ -48,9 +48,9 @@ copyright = u'2011, Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett &
# built documents.
#
# The short X.Y version.
version = '1.0.1'
version = '1.0.2'
# The full version, including alpha/beta/rc tags.
release = '1.0.1'
release = '1.0.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View file

@ -1,4 +1,4 @@
__title__ = 'django-imagekit'
__author__ = 'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett, Matthew Tretter, Eric Eldredge'
__version__ = (1, 1, 0, 'dev', 0)
__version__ = (1, 0, 2, 'final', 0)
__license__ = 'BSD'