Merge branch 'master' into chickenpwny-patch-scottsard

This commit is contained in:
mauvehed 2020-07-12 19:10:35 -05:00 committed by GitHub
commit ced07a4788
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 92 additions and 36 deletions

View file

@ -1,5 +1,9 @@
{
"people": [
{
"displayname" : "Don Blumenthal",
"filename" : "donblumenthal"
},
{
"displayname" : "Jay Des Dyson (Cancer Omega)",
"filename" : "jaydesdyson"
@ -163,6 +167,10 @@
{
"displayname" : "Scott Sard (Metalrat)",
"filename" : "scottsard"
},
{
"displayname" : "Larry Tesler",
"filename" : "larrytesler"
}
]
}