Merge branch 'access_token' of zelifcam-access_token

# Conflicts: # configuration.default.ini # mumbleBot.py
2019-02-15 13:33:33 +01:00
parent fcad1db04a cf99e661fb
commit 09ad7d5d04
2 changed files with 16 additions and 0 deletions
--- a/configuration.default.ini
+++ b/configuration.default.ini
@ -3,6 +3,7 @@ host = 127.0.0.1
 port = 64738
 password =
 channel =
+tokens = # example: token1,token2
 certificate =

 [bot]
@ -126,3 +127,4 @@ admin_help = Admin command:
 [debug]
 ffmpeg = False
 mumbleConnection = False
+