Merge branch 'master' into new_version

Schrolli91 · Oct 23, 2018 · 69452e9 · 69452e9
2 parents 740f10d + 56f62c3
commit 69452e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,6 @@
 # Changelog
 
 
-### __[v#.#]__ - date
-##### Added
-##### Changed
-##### Deprecated
-##### Removed
-##### Fixed
-##### Security
-
 
 ### __[v2.4.1]__ - 23.20.2018
 ##### Added

diff --git a/includes/globalVars.py b/includes/globalVars.py
@@ -10,9 +10,8 @@
 
 # version info
 versionNr = "2.4.1"
-branch = "dev"
-buildDate = "unreleased"
-
+branch = "master"
+buildDate = "23.10.2018"
 
 # Global variables
 config = 0