Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Changelog/ChangelogManager.cs # Content.Client/Doors/AirlockVisualizer.cs # Content.Client/Humanoid/SingleMarkingPicker.xaml.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml		2023-04-23 16:02:09 +03:00
..
CreditsWindow.xaml	Fixing some warnings (#6250)	2022-01-21 10:38:35 +01:00
CreditsWindow.xaml.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-23 16:02:09 +03:00