mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-19 17:16:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
#	src/main/resources/license/THIRD-PARTY.txt
This commit is contained in:
Sebastian Stenzel
2022-04-03 12:53:08 +02:00
parent 4abb41aebd 6af016f1fe
commit e93e31e745
121 changed files with 1783 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/module-info.java
View File

@@ -2,6 +2,8 @@ import org.cryptomator.integrations.tray.TrayMenuController;
import org.cryptomator.ui.traymenu.AwtTrayMenuController;
module org.cryptomator.desktop {
requires static org.jetbrains.annotations;
requires org.cryptomator.cryptofs;
requires org.cryptomator.frontend.dokany;
requires org.cryptomator.frontend.fuse;
@@ -31,6 +33,8 @@ module org.cryptomator.desktop {
opens org.cryptomator.common.settings to com.google.gson;
opens org.cryptomator.launcher to javafx.graphics;
opens org.cryptomator.common to javafx.fxml;
opens org.cryptomator.common.vaults to javafx.fxml;
opens org.cryptomator.ui.addvaultwizard to javafx.fxml;