mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-05-23 21:21:31 +00:00
b7fa1ae6d8
# Conflicts: # src/main/java/org/cryptomator/common/vaults/Vault.java # src/main/java/org/cryptomator/ui/eventview/EventListCellController.java # src/main/java/org/cryptomator/ui/eventview/EventListCellFactory.java # src/main/java/org/cryptomator/ui/eventview/EventViewController.java # src/main/java/org/cryptomator/ui/eventview/EventViewModule.java # src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java # src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java # src/main/resources/css/dark_theme.css # src/main/resources/css/light_theme.css # src/main/resources/fxml/eventview.fxml # src/main/resources/fxml/vault_detail_unlocked.fxml # src/main/resources/fxml/vault_list.fxml # src/main/resources/i18n/strings.properties