Merge upstream

This commit is contained in:
2016-09-05 16:24:17 +02:00
10 changed files with 166 additions and 25 deletions

View File

@@ -18,8 +18,15 @@ Willkommen bei Mikubot v2!
Sende /hilfe, um zu starten
]],
-- The symbol that starts a command. Usually noted as '/' in documentation.
-- DO NOT CHANGE THIS
cmd_pat = '/',
-- Text for users, who are not approved
banhammer_text = [[
Dies ist ein privater Bot, der erst nach einer Freischaltung benutzt werden kann.
This is a private bot, which can only be used after an approval.
]],
-- false = only whitelisted users can use inline querys
-- NOTE that it doesn't matter, if the chat is whitelisted! The USER must be whitelisted!