From 9d40e22783c751ee57eebf42167d4c0998651005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 2 Jun 2014 18:28:08 +0200 Subject: [PATCH 1/2] Release 1.6 --- CHANGELOG | 2 +- openslides/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6e00594d1..bacda1e20 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ http://openslides.org -Version 1.6 (unreleased) +Version 1.6 (2014-06-02) ======================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=14] diff --git a/openslides/__init__.py b/openslides/__init__.py index 0efe656ea..192f1a746 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -VERSION = (1, 6, 0, 'rc', 1) # During development it is the next release -RELEASE = False +VERSION = (1, 6, 0, 'final', 1) # During development it is the next release +RELEASE = True def get_version(version=None, release=None): From 5db47bef76887bc100ed0b956ddadf19eeb7f178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 2 Jun 2014 18:30:07 +0200 Subject: [PATCH 2/2] Update version to 1.6.1-dev --- CHANGELOG | 5 +++++ openslides/__init__.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bacda1e20..fc619bbd0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,11 @@ http://openslides.org +Version 1.6.1 (unreleased) +========================== +[https://github.com/OpenSlides/OpenSlides/issues?milestone=16] + + Version 1.6 (2014-06-02) ======================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=14] diff --git a/openslides/__init__.py b/openslides/__init__.py index 192f1a746..a146589c4 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -VERSION = (1, 6, 0, 'final', 1) # During development it is the next release -RELEASE = True +VERSION = (1, 6, 1, 'final', 1) # During development it is the next release +RELEASE = False def get_version(version=None, release=None):