Sebastian Stenzel 2b255ed101 Merge branch 'develop' into feature/integrations-api-1.1.0 ...

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

2022-04-13 07:21:59 +02:00

..

license

Single maven module (#1676)

2021-06-04 20:09:10 +02:00

main

Merge branch 'develop' into feature/integrations-api-1.1.0

2022-04-13 07:21:59 +02:00

package

create buildkit via CI

2021-07-19 21:20:27 +02:00

test

Merge branch 'develop' into feature/integrations-api-1.1.0

2022-04-13 07:21:59 +02:00