NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Preferences
History
Morb0 2329662efd Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
2024-04-18 07:04:01 +03:00
..
UI Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-04-18 07:04:01 +03:00
ClientPreferencesManager.cs Fix upstream 2024-04-17 12:49:15 +03:00
IClientPreferencesManager.cs Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00