Merge upstream

This commit is contained in:
Cyberboss
2017-09-07 22:20:26 -04:00
20 changed files with 505 additions and 437 deletions
+2 -1
View File
@@ -75,7 +75,8 @@ namespace TGServerService
ServerUpdateApplied = 6300,
ChatBroadcastFail = 6400,
IRCLogModes = 6500,
InteropCallException = 6600,
SubmoduleReclone = 6600,
InteropCallException = 6700,
}
static TGServerService ActiveService; //So everyone else can write to our eventlog