Sebastian Stenzel c99f23a4c7 Merge branch 'support/1.4.x' into develop ...

# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml

2019-10-31 01:11:02 +01:00

..

src

TODOs

2019-10-23 14:23:53 +02:00

pom.xml

Merge branch 'support/1.4.x' into develop

2019-10-31 01:11:02 +01:00