Merge remote-tracking branch 'origin/main' into global-shortcuts
This commit is contained in:
@@ -9,6 +9,7 @@ import "./settings.css";
|
||||
import { classNameFactory } from "@vencord/types/api/Styles";
|
||||
import { BaseText, Divider, ErrorBoundary } from "@vencord/types/components";
|
||||
import { ComponentType } from "react";
|
||||
import { WebRTCIPHandlingPolicyPicker } from "renderer/components/settings/WebRTCIPHandlingPolicyPicker";
|
||||
import { KeybindsButton } from "renderer/globalShortcuts/ShortcutSettings";
|
||||
import { Settings, useSettings } from "renderer/settings";
|
||||
import { isMac, isWindows } from "renderer/utils";
|
||||
@@ -148,8 +149,11 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
|
||||
title: "Open Links in app (experimental)",
|
||||
description: "Opens links in a new Vesktop window instead of your web browser",
|
||||
defaultValue: false
|
||||
}
|
||||
},
|
||||
|
||||
WebRTCIPHandlingPolicyPicker
|
||||
],
|
||||
|
||||
"Developer Options": [DeveloperOptionsButton]
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user