Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald

This commit is contained in:
Detective Google
2020-06-20 14:00:14 -05:00
262 changed files with 8625 additions and 265592 deletions

View File

@@ -36,10 +36,6 @@ map deltastation
minplayers 50
endmap
map icebox
minplayers 25
endmap
map snaxi
minplayers 25
endmap