Sebastian Stenzel 7b08c5d287 Merge branch 'develop' into feature/vault-format-8 ...

# Conflicts:
#	main/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
[ci skip]

2021-02-26 10:10:50 +01:00

..

src

Merge branch 'develop' into feature/vault-format-8

2021-02-26 10:10:50 +01:00

pom.xml

fix wrong versions that have been merged from main branch

2021-02-26 10:05:26 +01:00