Merge pull request #1129 from normanjaeckel/Release-1.5

Release 1.5
2013-11-25 11:32:01 -08:00 · 2013-11-25 11:32:01 -08:00 · abee1f04ba
commit abee1f04ba
parent 521c57a827 dfa334782e
2 changed files with 7 additions and 2 deletions
--- a/7
+++ b/7
@ -4,7 +4,12 @@

 http://openslides.org

-Version 1.5 (unreleased)
+Version 1.5.1 (unreleased)
+==========================
+[https://github.com/OpenSlides/OpenSlides/issues?milestone=15]
+
+
+Version 1.5 (2013-11-25)
 ========================
 [https://github.com/OpenSlides/OpenSlides/issues?milestone=10]

--- a/openslides/init.py
+++ b/openslides/init.py
@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-

-VERSION = (1, 5, 0, 'rc', 1)  # During development it is the next release
+VERSION = (1, 5, 1, 'final', 1)  # During development it is the next release
 RELEASE = False