Dan 9999c77e95 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/client.py # pyrogram/client/methods/messages/send_animation.py # pyrogram/client/methods/messages/send_audio.py # pyrogram/client/methods/messages/send_document.py # pyrogram/client/methods/messages/send_photo.py # pyrogram/client/methods/messages/send_sticker.py # pyrogram/client/methods/messages/send_video.py # pyrogram/client/methods/messages/send_video_note.py # pyrogram/client/methods/messages/send_voice.py # pyrogram/client/types/messages_and_media/message.py		2019-01-11 14:24:15 +01:00
..
bots	Fix asyncio merge	2019-01-07 22:57:19 +01:00
chats	Merge branch 'develop' into asyncio	2019-01-07 22:51:57 +01:00
contacts	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
decorators	Update copyright year	2019-01-01 12:36:16 +01:00
messages	Merge branch 'develop' into asyncio	2019-01-11 14:24:15 +01:00
password	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
users	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
__init__.py	Update copyright year	2019-01-01 12:36:16 +01:00