Morbo 228c19c52c Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml # Resources/Prototypes/Maps/origin.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/white.png		2022-10-28 17:19:32 +03:00
..
ISSUE_TEMPLATE	Typo issue template	2022-06-16 01:57:03 +03:00
workflows	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-10-28 17:19:32 +03:00
CODEOWNERS	Add self to code owners (#10634)	2022-08-15 20:32:40 -07: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	Adding a PR guidelines link to the github PR tempalte (#10057)	2022-07-26 17:36:04 -07:00
rsi-schema.json	Adds support for CC-BY-NC licenses (#6648)	2022-02-10 20:27:48 -07:00