Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

2017-10-04 20:18:03 -04:00
parent f7c6c8b440 282dcb3c16
commit 5cefa71992
182 changed files with 4226 additions and 3618 deletions
@@ -286,7 +286,7 @@ ANNOUNCE_ADMIN_LOGOUT

 ## Map rotation
 ## You should edit maps.txt to match your configuration when you enable this.
-#MAPROTATION
+MAPROTATION

 ## Map voting
 ## Allows players to vote for their preffered map