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
..
linux	Merge branch 'develop' into feature/hub	2022-06-22 09:55:02 +02:00
mac	Merge branch 'develop' into feature/hub	2022-06-22 09:55:02 +02:00
win	Merge branch 'feature/hub' into develop	2022-07-26 12:29:33 +02:00