[MERGE] forward port of branch 8.0 up to 262eb66

[odoo/odoo.git] / doc / conf.py

diff --git a/doc/conf.py b/doc/conf.py
index 9ae72b9..34f77c9 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -53,9 +53,9 @@ copyright = u'2014, OpenERP s.a.'
 # built documents.
 #
 # The short X.Y version.
-version = '8.0'
+version = 'master'
 # The full version, including alpha/beta/rc tags.
-release = '8.0b1'
+release = 'master'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used: