Dan 10f3829c93 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/client.py # pyrogram/connection/connection.py # pyrogram/connection/transport/tcp/tcp.py # pyrogram/connection/transport/tcp/tcp_intermediate.py # pyrogram/session/session.py		2018-09-01 01:05:25 +02:00
..
tcp	Merge branch 'develop' into asyncio	2018-09-01 01:05:25 +02:00
__init__.py	Update copyright year	2018-01-01 13:24:07 +01:00