Morb0 4f43e73d14 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml		2024-03-11 08:37:54 +03:00
..
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-11 08:37:54 +03:00
ClientPreferencesManager.cs	Fix sponsors prototypes	2024-02-26 16:11:35 +03:00
IClientPreferencesManager.cs	Re-organize all projects (#4166)	2021-06-09 22:19:39 +02:00