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

Browse Source

Conflicts:
	plugins/stats.lua

...

This commit is contained in:

yago 2015-02-11 21:58:05 +01:00

parent 7d25e0a3d5 76b37397cb

commit 475f6fcfec

1 changed files with 8 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files