aboutsummaryrefslogtreecommitdiffstats
path: root/docs/sphinx/conf.py
diff options
context:
space:
mode:
authorLibravatarAgustin Henze <tin@sluc.org.ar>2015-07-08 07:35:06 -0300
committerLibravatarAgustin Henze <tin@sluc.org.ar>2015-07-08 07:35:06 -0300
commit055d72d76b44b0e627c8a17c48dbecd62e44197b (patch)
treee2c8d5475477c46115461fe9547c1ee797873635 /docs/sphinx/conf.py
parent61f3aad02cd6492cb38e41b66f2ed8ec56e98981 (diff)
parentb0b24795b24ee6809397fbbadf42f31f310a219f (diff)
Merge tag 'upstream/7.6.0'
Upstream version 7.6.0
Diffstat (limited to 'docs/sphinx/conf.py')
-rw-r--r--docs/sphinx/conf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index 359cf1c..36cf31b 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -47,16 +47,16 @@ master_doc = 'index'
# General information about the project.
project = 'Nikola'
-copyright = '2012-2014, The Nikola Contributors'
+copyright = '2012-2015, The Nikola Contributors'
# The version info for the project yo're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
-version = '7.1.0'
+version = '7.6.0'
# The full version, including alpha/beta/rc tags.
-release = '7.1.0'
+release = '7.6.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.