Merge branch 'develop' of github.com:mbi/django-rosetta into develop

This commit is contained in:
Marco Bonetti 2016-05-14 23:10:01 +02:00
commit 7264033178
3 changed files with 7 additions and 7 deletions

View file

@ -1,8 +1,8 @@
Version History
===============
Version 0.7.11 (unreleased)
---------------------------
Version 0.7.11
--------------
* Make MO file compilation optional (PR #166, Issue #155, thanks @nealtodd)
* Fix an invalid page get parameter by falling back to page 1 (PR #165, thanks @nealtodd)
* Adds reference language selector (PR #60, thanks @hsoft)

View file

@ -47,7 +47,7 @@ master_doc = 'index'
# General information about the project.
project = u'Django Rosetta'
copyright = u'2016, Marco Bonetti'
copyright = u'2008 2016 Marco Bonetti and contributors'
author = u'Marco Bonetti'
# The version info for the project you're documenting, acts as replacement for
@ -55,9 +55,9 @@ author = u'Marco Bonetti'
# built documents.
#
# The short X.Y version.
version = '0.7.10'
version = '0.7.11'
# The full version, including alpha/beta/rc tags.
release = '0.7.10'
release = '0.7.11'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@ -108,7 +108,7 @@ todo_include_todos = False
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'sphinx_rtd_theme'
# html_theme = 'sphinx_rtd_theme'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the

View file

@ -1,4 +1,4 @@
VERSION = (0, 7, 10)
VERSION = (0, 7, 11)
def get_version(svn=False, limit=3):