NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-19 07:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
CatStation/Content.Client/Preferences
History
Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Changelog/ChangelogManager.cs
#	Content.Client/Doors/AirlockVisualizer.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
..
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-04-23 16:02:09 +03:00
ClientPreferencesManager.cs Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
IClientPreferencesManager.cs Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00