Sebastian Stenzel 2229a56831 Merge branch 'master' into develop ...

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml

2019-02-15 08:45:05 +01:00

..

ant-kit

bumping version number [ci skip]

2019-02-15 08:41:20 +01:00

commons

bumping version number [ci skip]

2019-02-15 08:41:20 +01:00

keychain

bumping version number [ci skip]

2019-02-15 08:41:20 +01:00

launcher

bumping version number [ci skip]

2019-02-15 08:41:20 +01:00

uber-jar

bumping version number [ci skip]

2019-02-15 08:41:20 +01:00

ui

bumping version number [ci skip]

2019-02-15 08:41:20 +01:00

pom.xml

Merge branch 'master' into develop

2019-02-15 08:45:05 +01:00