Merge branch 'develop'

Author: tobihagemann

docs/desktop/advanced-settings.md

@@ -93,6 +93,7 @@ java-options=-Duser.language=hu
 | `cryptomator.ipcSocketPath=[FilePath]`                        | The path to the IPC socket used for checking for an already running application instance.                                                                        | All   |
 | `cryptomator.mountPointsDir=[DirPath]`                        | The directory where Cryptomator mounts vaults if no per-vault location has been set.                                                                             | All   |
 | `cryptomator.showTrayIcon=[Boolean]`                          | Whether Cryptomator should show an icon in the system tray (true) or not (false).                                                                                | All   |
+| `cryptomator.disableUpdateCheck=[Boolean]`                    | Whether to disable automatic update checks (true) or allow them (false). Defaults to false.                                                                      | All   |
 | `cryptomator.integrationsWin.autoStartShellLinkName=[String]` | The name of the link created for starting Cryptomator at system startup.                                                                                         | Win   |
 | `cryptomator.integrationsWin.keychainPaths=[FilePathList]`    | The paths to load keychains from.                                                                                                                                | Win   |
 | `cryptomator.integrationsMac.keychainServiceName=[String]`    | The name of the keychain service.                                                                                                                                | Mac   |