From 35e31874a1bc4fcb22c37d2edf8a7b84ab017ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 11 Nov 2014 00:01:45 +0100 Subject: [PATCH 1/3] Updated CHANGELOG. --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 23e202612..9fb5dc871 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,7 +23,7 @@ Participants: * Updated error message if group id does not exists. Other: - Fixed CKEditor stuff (added insertpre plugin and removed unused code). -- Updated German and Czech translation. +- Updated French, German and Czech translation. Version 1.6 (2014-06-02) From 9a50dab5fc07f1060f594d24b834478590d3debc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 4 Dec 2014 15:45:19 +0100 Subject: [PATCH 2/3] Release 1.6.1 --- CHANGELOG | 2 +- openslides/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9fb5dc871..5fdcc322b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ http://openslides.org -Version 1.6.1 (unreleased) +Version 1.6.1 (2014-12-08) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=16] diff --git a/openslides/__init__.py b/openslides/__init__.py index a146589c4..cb8dee6b1 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- VERSION = (1, 6, 1, 'final', 1) # During development it is the next release -RELEASE = False +RELEASE = True def get_version(version=None, release=None): From 750918fe744b6d905a6cb6628d3b666dfacad884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 4 Dec 2014 15:47:21 +0100 Subject: [PATCH 3/3] Update version to 1.6.2-dev --- CHANGELOG | 5 +++++ openslides/__init__.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5fdcc322b..e09e3d91a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,11 @@ http://openslides.org +Version 1.6.2 (unreleased) +========================== +[https://github.com/OpenSlides/OpenSlides/milestones/1.6.2] + + Version 1.6.1 (2014-12-08) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=16] diff --git a/openslides/__init__.py b/openslides/__init__.py index cb8dee6b1..58b5f8b81 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -VERSION = (1, 6, 1, 'final', 1) # During development it is the next release -RELEASE = True +VERSION = (1, 6, 2, 'final', 1) # During development it is the next release +RELEASE = False def get_version(version=None, release=None):