NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 11:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
CatStation/Content.Client/Preferences
History
Morbo 82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
..
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-07 18:54:29 +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