Armin Schrenk aec56c48c5 Merge branch 'develop' into feature/#1228-forcedUnmountDialog ...

# Conflicts:
#	main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

2020-12-09 14:51:00 +01:00

..

buildkit

Bumped version

2020-11-18 13:15:33 +01:00

commons

fixed test

2020-12-08 12:51:34 +01:00

launcher

Bumped version

2020-11-18 13:15:33 +01:00

ui

Merge branch 'develop' into feature/#1228-forcedUnmountDialog

2020-12-09 14:51:00 +01:00

pom.xml

temp fix for vulnerability in upstream lib

2020-12-08 08:30:16 +01:00