Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +03:00
..
ISSUE_TEMPLATE	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
workflows	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
CODEOWNERS	Refactoring body system to use containers and general body cleanup (#20202)	2023-09-21 17:23:02 +10:00
config.yml	Create config.yml	2020-02-04 20:42:36 +01:00
labeler.yml	Fix labeler localization path	2022-06-21 01:24:26 +03:00
PULL_REQUEST_TEMPLATE.md	Update pull request template (#18900)	2023-08-18 09:22:00 -08:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00