OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-11-22 15:17:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Aydar Biktimirov 2016-03-11 23:03:13 +03:00
commit dc9b77e02c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.rst
View file

@ -36,7 +36,7 @@ A Python wrapper around the Telegram Bot API.
:alt: Coveralls
.. image:: https://img.shields.io/badge/Telegram-Group-blue.svg
:target: https://telegram.me/joinchat/ALnA-AJQm5TcNEiy2G_4cQ
:target: https://telegram.me/joinchat/ALnA-AJQm5Q1D_Kxt8lFiA
:alt: Telegram Group
=================
@ -426,7 +426,7 @@ You may copy, distribute and modify the software provided that modifications are
_`Contact`
==========
Feel free to join to our `Telegram group <https://telegram.me/joinchat/ALnA-AJQm5TcNEiy2G_4cQ>`_.
Feel free to join to our `Telegram group <https://telegram.me/joinchat/ALnA-AJQm5Q1D_Kxt8lFiA>`_.
=======
_`TODO`

8
telegram/bot.py
View file

@ -210,11 +210,11 @@ class Bot(TelegramObject):
chat_id:
Unique identifier for the message recipient - telegram.Chat id.
parse_mode:
Send Markdown, if you want Telegram apps to show bold, italic and
inline URLs in your bot's message. For the moment, only Telegram
for Android supports this. [Optional]
Send 'Markdown', if you want Telegram apps to show bold, italic and
inline URLs in your bot's message. [Optional]
text:
Text of the message to be sent.
Text of the message to be sent. The current maximum length is 4096
UTF8 characters.
disable_web_page_preview:
Disables link previews for links in this message. [Optional]
disable_notification: