Sebastian Stenzel ec69c1411b Merge commit 'ad28d4510d8b99db02c1883f1061817b658f3407' into develop ...

# Conflicts:
#	main/ui/src/main/resources/i18n/strings_de.properties

2019-10-13 15:35:00 +02:00

..

src

Merge commit 'ad28d4510d8b99db02c1883f1061817b658f3407' into develop

2019-10-13 15:35:00 +02:00

pom.xml

Added first prototyp for recovery key generation

2019-09-27 21:43:42 +02:00