Commit 34634ffa authored by MBoretto's avatar MBoretto

Merge branch 'master' into hotfix

synk hotfix to  master
parents 2b0d4ee1 3be45232
This is at least a partial credits-file of people that have
contributed to the current project. It is sorted by name and
formatted to allow easy grepping and beautification by
scripts. The fields are: name (N), email (E), web-address
(W) and description (D).
Thanks,
Avtandil Kikabidze
----------
N: Avtandil Kikabidze aka LONGMAN
E: akalongman@gmail.com
W: http://longman.ge
D: Project owner, Maintainer
N: Marco Boretto
E: marco.bore@gmail.com
D: Maintainer and Collaborator
...@@ -214,7 +214,7 @@ $telegram->setLogPath($BOT_NAME.'.log'); ...@@ -214,7 +214,7 @@ $telegram->setLogPath($BOT_NAME.'.log');
``` ```
This code is available on [Github][0]. Pull requests are welcome. This code is available on [Github](https://github.com/akalongman/php-telegram-bot). Pull requests are welcome.
##Troubleshooting ##Troubleshooting
...@@ -229,7 +229,5 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for information. ...@@ -229,7 +229,5 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for information.
## Credits ## Credits
Created by [Avtandil Kikabidze][1]. Credit list in [CREDITS](CREDITS)
[0]: https://github.com/akalongman/php-telegram-bot
[1]: mailto:akalongman@gmail.com
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment