Dan 8ef97f2177 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/methods/messages/edit_message_text.py # pyrogram/client/methods/messages/send_animation.py # pyrogram/client/methods/messages/send_audio.py # pyrogram/client/methods/messages/send_cached_media.py # pyrogram/client/methods/messages/send_document.py # pyrogram/client/methods/messages/send_message.py # pyrogram/client/methods/messages/send_photo.py # pyrogram/client/methods/messages/send_video.py # pyrogram/client/methods/messages/send_voice.py # pyrogram/client/parser/html.py # pyrogram/client/parser/markdown.py # pyrogram/client/types/input_message_content/input_text_message_content.py		2019-06-26 19:34:49 +02:00
..
__init__.py	Add Parser package	2019-06-26 16:07:27 +02:00
html.py	Merge branch 'develop' into asyncio	2019-06-26 19:34:49 +02:00
markdown.py	Merge branch 'develop' into asyncio	2019-06-26 19:34:49 +02:00
parser.py	Only allow either "markdown" or "html" as text style parse mode	2019-06-26 16:36:00 +02:00
utils.py	Add Parser package	2019-06-26 16:07:27 +02:00