Dan 976eae63ed Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/client.py # pyrogram/client/methods/messages/send_media_group.py # pyrogram/client/methods/utilities/download_media.py		2018-12-15 11:12:30 +01:00
..
__init__.py	Revert "Export resolve_peer"	2018-08-10 11:29:05 +02:00
download_media.py	Merge branch 'develop' into asyncio	2018-12-15 11:12:30 +01:00