diff --git a/CHANGELOG b/CHANGELOG index e5648932b7..cf113739a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 3.2.0 - 2014-04-21 +* Bug fixes (see mercurial logs for details) * Add restore_history to ModelSQL * Add history revisions * Add the multi selection widget diff --git a/COPYRIGHT b/COPYRIGHT index 59d0304b04..56848fab56 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2007-2013 Cédric Krier. +Copyright (C) 2007-2014 Cédric Krier. Copyright (C) 2007-2013 Bertrand Chenal. -Copyright (C) 2008-2013 B2CK SPRL. +Copyright (C) 2008-2014 B2CK SPRL. Copyright (C) 2011 Openlabs Technologies & Consulting (P) Ltd. This program is free software: you can redistribute it and/or modify diff --git a/doc/conf.py b/doc/conf.py index 24f1a90eca..71c121e134 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.1' +version = '3.2' # The full version, including alpha/beta/rc tags. -release = '3.1' +release = '3.2' # 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 f9f08af95f..788322a896 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.1.0" +VERSION = "3.2.0" LICENSE = "GPL-3" WEBSITE = "http://www.tryton.org/"