Merge remote-tracking branch 'origin/master' into bot2.1

This commit is contained in:
Leandro Toledo 2016-05-27 21:10:24 -03:00
commit 22e9326610

View file

@ -35,6 +35,10 @@ Not **just** a Python wrapper around the Telegram Bot API
:target: https://coveralls.io/github/python-telegram-bot/python-telegram-bot?branch=master
:alt: Coveralls
.. image:: http://isitmaintained.com/badge/resolution/python-telegram-bot/python-telegram-bot.svg
:target: http://isitmaintained.com/project/python-telegram-bot/python-telegram-bot
:alt: Average time to resolve an issue
.. image:: https://img.shields.io/badge/Telegram-Group-blue.svg
:target: https://telegram.me/pythontelegrambotgroup
:alt: Telegram Group