CatStation/.github
Morbo 82a466f4ff Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Resources/Audio/Announcements/license.txt
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
..
ISSUE_TEMPLATE Improve issue template (#13379) 2023-01-10 22:39:54 +11:00
workflows Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-07 18:54:29 +03:00
CODEOWNERS Remove self from test co-owner (#13131) 2022-12-21 06:13:10 -08: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 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-13 05:38:06 +03:00
rsi-schema.json Adds support for CC-BY-NC licenses (#6648) 2022-02-10 20:27:48 -07:00