Merge branch 'master' into public_next

This commit is contained in:
Steel Titanium 2020-02-16 21:00:08 -05:00
commit 7dac10f5f9
No known key found for this signature in database
GPG Key ID: 924BA411F18DFDBE
1 changed files with 1 additions and 1 deletions

View File

@ -1261,7 +1261,7 @@ static const char *credits[] = {
"Cody \"SRB2 Playah\" Koester",
"Skye \"OmegaVelocity\" Meredith",
"Stephen \"HEDGESMFG\" Moellering",
"Nick \"ST218\" Molina",
"Rosalie \"ST218\" Molina",
"Samuel \"Prime 2.0\" Peters",
"Colin \"Sonict\" Pfaff",
"Bill \"Tets\" Reed",