Dan 3f7b0b25af Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/client.py # pyrogram/client/methods/chats/get_chat_members.py # pyrogram/client/methods/chats/get_dialogs.py # pyrogram/client/methods/messages/send_animation.py # pyrogram/client/methods/messages/send_venue.py		2018-08-22 10:30:25 +02:00
..
__init__.py	Revert "Export resolve_peer"	2018-08-10 11:29:05 +02:00
download_media.py	Merge branch 'develop' into asyncio	2018-08-22 10:30:25 +02:00