Merge branch 'release/0.8.0' into develop

This commit is contained in:
Jannis Leidel 2010-11-07 00:26:15 +01:00
commit ac3ae862bd
3 changed files with 6 additions and 5 deletions

View file

@ -1 +1 @@
__version__ = "0.7.4"
__version__ = "0.8.0"

View file

@ -45,9 +45,9 @@ copyright = u'2010, Jannis Leidel'
# built documents.
#
# The short X.Y version.
version = '0.7.4'
version = '0.8.0'
# The full version, including alpha/beta/rc tags.
release = '0.7.4'
release = '0.8.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View file

@ -295,10 +295,11 @@ Admin actions
Changelog
=========
0.7.5 (unreleased)
------------------
0.8.0 (11-07-10)
----------------
* Added Finnish translation (by jholster)
* Added --overwrite and --app-first options to sync_templates command (by Alex Kamedov).
0.7.4 (09-23-10)