Morb0 611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors ... # Conflicts: # .github/workflows/publish.yml # Content.Packaging/ContentPackaging.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Resources/Audio/Weapons/Guns/Gunshots/license.txt # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png		2023-11-08 03:00:51 +03:00
..
ChatManager.cs	Merge remote-tracking branch 'upstream/master' into update-sposnors	2023-11-08 03:00:51 +03:00
ChatSanitizationManager.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-22 18:36:48 +03:00
IChatManager.cs	Fix erase verb not removing chat messages in some cases (#21355)	2023-11-05 19:19:59 -07:00
IChatSanitizationManager.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00