Morb0 be480aced1 Merge remote-tracking branch 'wizards/master' into upstream-sync ...

# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml

2024-10-30 16:38:56 +03:00

..

ClientContentIoC.cs

Merge remote-tracking branch 'wizards/master' into upstream-sync

2024-10-30 16:38:56 +03:00

ClientModuleTestingCallbacks.cs

Move some files out of Content.Shared root because I forgot (#4182)

2021-06-13 22:52:40 +10:00

StaticIoC.cs

Unrevert audio (#21330)

2023-11-27 22:12:34 +11:00