From 119fb90bfd3884840febd6f762166ce1edb5bc49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 29 Jul 2013 20:17:26 +0200 Subject: [PATCH 1/2] Release 1.4.1 --- CHANGELOG | 2 +- README.txt | 2 +- openslides/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9157ecebd..7115258c9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ http://openslides.org -Version 1.4.1 (unreleased) +Version 1.4.1 (2013-07-29) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=11] diff --git a/README.txt b/README.txt index 8d0e6ebbc..30cf9c77f 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ English README file for OpenSlides ==================================== -This is OpenSlides, version 1.4.1 (unreleased). +This is OpenSlides, version 1.4.1 (2013-07-29). What is OpenSlides? diff --git a/openslides/__init__.py b/openslides/__init__.py index 943360c76..be2d70ad6 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -6,7 +6,7 @@ """ VERSION = (1, 4, 1, 'final', 1) # During development it is the next release -RELEASE = False +RELEASE = True def get_version(version=None, release=None): From 1225c5bbb65e17d0d13c8f70783a2ceb92531cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 29 Jul 2013 20:19:29 +0200 Subject: [PATCH 2/2] Update version to 1.4.2-dev --- CHANGELOG | 3 +++ README.txt | 2 +- openslides/__init__.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7115258c9..e7dc5fc89 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,9 @@ http://openslides.org +Version 1.4.2 (unreleased) +========================== + Version 1.4.1 (2013-07-29) ========================== diff --git a/README.txt b/README.txt index 30cf9c77f..67aaa5c3d 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ English README file for OpenSlides ==================================== -This is OpenSlides, version 1.4.1 (2013-07-29). +This is OpenSlides, version 1.4.2 (unreleased). What is OpenSlides? diff --git a/openslides/__init__.py b/openslides/__init__.py index be2d70ad6..a5fb7d9fc 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -5,8 +5,8 @@ :license: GNU GPL, see LICENSE for more details. """ -VERSION = (1, 4, 1, 'final', 1) # During development it is the next release -RELEASE = True +VERSION = (1, 4, 2, 'final', 1) # During development it is the next release +RELEASE = False def get_version(version=None, release=None):