Merge branch 'master' into next

This commit is contained in:
SteelT 2021-09-05 01:30:12 -04:00
commit 82b1499eb0

View file

@ -445,9 +445,9 @@ static const char *credits[] = {
"", "",
"\1Support Programming", "\1Support Programming",
"Colette \"fickleheart\" Bordelon", "Colette \"fickleheart\" Bordelon",
"James R.",
"\"Lat\'\"", "\"Lat\'\"",
"\"Monster Iestyn\"", "\"Monster Iestyn\"",
"James Robert Roman",
"\"Shuffle\"", "\"Shuffle\"",
"\"SteelT\"", "\"SteelT\"",
"", "",