CatStation/Content.Client/Options/UI
Morb0 775cbf088c Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Objects/Misc/books.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2024-05-23 13:06:49 +03:00
..
Tabs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-23 13:06:49 +03:00
EscapeMenu.xaml Guidebook Revival (#13320) 2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00
OptionsMenu.xaml Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430) 2023-12-12 17:58:20 -08:00
OptionsMenu.xaml.cs Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430) 2023-12-12 17:58:20 -08:00