Armin Schrenk 8662abae5a Merge branch 'feature/hub' into develop ...

# Conflicts:
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	dist/win/build.ps1
#	src/main/java/org/cryptomator/common/Environment.java

2022-07-26 12:29:33 +02:00

..

main

Merge branch 'feature/hub' into develop

2022-07-26 12:29:33 +02:00

package

create buildkit via CI

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

test

Merge branch 'feature/hub' into develop

2022-07-26 12:29:33 +02:00