Permalink
Browse files

Merge branch 'stable/2.4.x'

  • Loading branch information...
2 parents 841003f + 2f6d50d commit 80a00391bdf737cd180c09301b60c28e9f3cc69a @sehmaschine committed Sep 18, 2012
Showing with 7 additions and 7 deletions.
  1. +2 −2 README.rst
  2. +2 −2 docs/conf.py
  3. +1 −1 docs/index.rst
  4. +1 −1 grappelli/__init__.py
  5. +1 −1 setup.py
View
@@ -18,8 +18,8 @@ http://readthedocs.org/docs/django-grappelli/
Releases
--------
-* Grappelli 2.4.2 (development version, not yet released): Compatible with Django 1.4
-* Grappelli 2.4.1 (September 17 2012): Compatible with Django 1.4
+* Grappelli 2.4.3 (development version, not yet released): Compatible with Django 1.4
+* Grappelli 2.4.2 (September 18 2012): Compatible with Django 1.4
* Grappelli 2.3.9 (September 06 2012): Compatible with Django 1.3
Older versions are availabe at GitHub, but are not supported anymore.
View
@@ -49,9 +49,9 @@
# built documents.
#
# The short X.Y version.
-version = '2.4.2'
+version = '2.4.3'
# The full version, including alpha/beta/rc tags.
-release = '2.4.2'
+release = '2.4.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
@@ -4,7 +4,7 @@
contain the root `toctree` directive.
.. |grappelli| replace:: Grappelli
.. |filebrowser| replace:: FileBrowser
-.. |version| replace:: 2.4.2
+.. |version| replace:: 2.4.3
.. _index:
View
@@ -1 +1 @@
-VERSION = '2.4.2'
+VERSION = '2.4.3'
View
@@ -7,7 +7,7 @@ def read(fname):
setup(
name='django-grappelli',
- version='2.4.2',
+ version='2.4.3',
description='A jazzy skin for the Django Admin-Interface.',
long_description = read('README.rst'),
author='Patrick Kranzlmueller, Axel Swoboda (vonautomatisch)',

0 comments on commit 80a0039

Please sign in to comment.