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 58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
..
UI Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
ClientPreferencesManager.cs Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
IClientPreferencesManager.cs Re-organize all projects (#4166) 2021-06-09 22:19:39 +02:00