Dan bc4c787599 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/__init__.py # pyrogram/client/types/messages_and_media/message.py # pyrogram/connection/transport/tcp/tcp.py		2018-11-03 12:04:31 +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-11-03 12:04:31 +01:00