Sebastian Stenzel ffd3981f36 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-16 11:41:50 +01:00

..

buildkit

add version.txt to buildkit

2019-02-15 19:38:21 +01:00

commons

preparing 1.4.5

2019-02-16 11:40:50 +01:00

keychain

preparing 1.4.5

2019-02-16 11:40:50 +01:00

launcher

preparing 1.4.5

2019-02-16 11:40:50 +01:00

ui

Merge branch 'master' into develop

2019-02-16 11:41:50 +01:00

pom.xml

preparing 1.4.5

2019-02-16 11:40:50 +01:00