mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-04 14:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/modular

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-07-06 13:19:07 +02:00
committed by GitHub
parent 429ca6cfd0 97222d3d67
commit cf7a2db7ec
35 changed files with 561 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/vault_options.fxml
+3 -3
View File
@@ -36,12 +36,12 @@
<fx:include source="vault_options_masterkey.fxml"/>
</content>
</Tab>
<Tab fx:id="autoLockTab" id="AUTOLOCK" text="%vaultOptions.autoLock">
<Tab fx:id="healthTab" id="HEALTH" text="%vaultOptions.health">
<graphic>
<FontAwesome5IconView glyph="STOPWATCH"/>
<FontAwesome5IconView glyph="STETHOSCOPE"/>
</graphic>
<content>
<fx:include source="vault_options_autolock.fxml"/>
<fx:include source="vault_options_health.fxml"/>
</content>
</Tab>
</tabs>