From decd4461d7ba93065c465bdb954b3b50ef60906e Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@dieschrollis.de>
Date: Thu, 21 Dec 2017 09:20:31 +0100
Subject: [PATCH] prepare new Version 2.3

---
 CHANGELOG.md           | 2 +-
 includes/globalVars.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea276d5..9a28116 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 
-### __[2.x]__ - unreleased
+### __[2.3]__ - 22.12.2017
 ##### Added
 - zuschaltbare POCSAG Multicast-Alarm Funktionalität [#307](https://github.com/Schrolli91/BOSWatch/pull/307)
 - Flag in Config um nur letzte Net Ident oder gesamte Historie zu speichern [#317](https://github.com/Schrolli91/BOSWatch/pull/317)
diff --git a/includes/globalVars.py b/includes/globalVars.py
index f5d416a..23f9377 100644
--- a/includes/globalVars.py
+++ b/includes/globalVars.py
@@ -10,8 +10,8 @@ Global variables
 
 # version info
 versionNr = "2.3"
-branch = "dev"
-buildDate = "unreleased"
+branch = "master"
+buildDate = "22/12/2017"
 
 
 # Global variables