From 18a434ed87f31bde8bd907b019f6a7c0f955ae5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 31 Mar 2014 22:53:03 +0200 Subject: [PATCH 1/2] Release 1.5.1 --- CHANGELOG | 4 ++-- openslides/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0f3e59dc0..79ab98a8c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ http://openslides.org -Version 1.5.1 (unreleased) +Version 1.5.1 (2014-03-31) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=15] @@ -27,7 +27,7 @@ Other: - Fixed http status code when requesting a non-existing static page using Tornado web server. - Fixed error in main script when using other database engine. -- Fixed error on motion PDF with nested lists +- Fixed error on motion PDF with nested lists. Version 1.5 (2013-11-25) diff --git a/openslides/__init__.py b/openslides/__init__.py index 941ae0b71..2157b9ed7 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- VERSION = (1, 5, 1, 'final', 1) # During development it is the next release -RELEASE = False +RELEASE = True def get_version(version=None, release=None): From ba1dc9673f37b21a37449d55a1c9b100a74a0dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 31 Mar 2014 21:48:04 +0200 Subject: [PATCH 2/2] Update version to 1.5.2-dev --- CHANGELOG | 4 ++++ openslides/__init__.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 79ab98a8c..00578fe4d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,10 @@ http://openslides.org +Version 1.5.2 (unreleased) +========================== + + Version 1.5.1 (2014-03-31) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=15] diff --git a/openslides/__init__.py b/openslides/__init__.py index 2157b9ed7..9f16d9bf6 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -VERSION = (1, 5, 1, 'final', 1) # During development it is the next release -RELEASE = True +VERSION = (1, 5, 2, 'final', 1) # During development it is the next release +RELEASE = False def get_version(version=None, release=None):