Merge branch 'master' into new_version

This commit is contained in:
Bastian Schroll 2018-10-23 08:02:30 +02:00 committed by GitHub
commit 69452e9036
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions

View file

@ -1,14 +1,6 @@
# Changelog
### __[v#.#]__ - date
##### Added
##### Changed
##### Deprecated
##### Removed
##### Fixed
##### Security
### __[v2.4.1]__ - 23.20.2018
##### Added

View file

@ -10,9 +10,8 @@ Global variables
# version info
versionNr = "2.4.1"
branch = "dev"
buildDate = "unreleased"
branch = "master"
buildDate = "23.10.2018"
# Global variables
config = 0