Arthur b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml		2022-07-29 17:59:17 +03:00
..
Client	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
Server	Add last names	2022-05-15 16:39:49 +03:00
Shared	yaml linter fix & alert sprite specifier changes (#10015)	2022-07-28 09:17:51 +10:00
Content.Tests.csproj	Update some nugets (#8738)	2022-06-09 18:25:59 -07:00
ContentUnitTest.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00