diff --git a/CHANGELOG b/CHANGELOG index 5b1e037160..6a2811cf29 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 3.4.0 - 2014-10-20 +* Bug fixes (see mercurial logs for details) * Use literal_eval instead of safe_eval (CVE-2014-6633) * Prevent double underscore in safe_eval (CVE-2014-6633) * Add pre-validation on button diff --git a/doc/conf.py b/doc/conf.py index c380a7f007..18e62c7eab 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,9 +48,9 @@ copyright = (u'2008-2011, Bertrand Chenal, Cédric Krier, Ian Wilson, ' # built documents. # # The short X.Y version. -version = '3.3' +version = '3.4' # The full version, including alpha/beta/rc tags. -release = '3.3' +release = '3.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/trytond/version.py b/trytond/version.py index 3b415c42d7..a68a845049 100644 --- a/trytond/version.py +++ b/trytond/version.py @@ -1,6 +1,6 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. PACKAGE = "trytond" -VERSION = "3.3.0" +VERSION = "3.4.0" LICENSE = "GPL-3" WEBSITE = "http://www.tryton.org/"