Merge branch 'patch-1' of git://github.com/doruq/telegram-bot into doruq-patch-1

Conflicts:
	plugins/stats.lua
This commit is contained in:
yago 2015-02-11 21:58:05 +01:00
commit 475f6fcfec

View File

@ -102,13 +102,13 @@ end
_stats = read_file_stats() _stats = read_file_stats()
return { return {
description = "Plugin to update user stats.", description = "Plugin to update user stats.",
usage = "!stats: Returns a list of Username [telegram_id]: msg_num", usage = "!stats: Returns a list of Username [telegram_id]: msg_num",
patterns = { patterns = {
".*", ".*",
"^!(stats)" "^!(stats)"
}, },
run = run run = run
} }
end end