Dan 5f727cb5a2 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/client.py # pyrogram/client/ext/base_client.py # pyrogram/client/methods/bots/request_callback_answer.py # pyrogram/session/session.py		2018-06-24 19:27:37 +02:00
..
api	Rename and rework Setup docs page	2018-06-05 16:37:57 +02:00
client	Merge branch 'develop' into asyncio	2018-06-24 19:27:37 +02:00
connection	Delegate timeout to TCP	2018-06-17 19:20:22 +02:00
crypto	Remove salt assertion	2018-06-16 22:05:54 +02:00
session	Merge branch 'develop' into asyncio	2018-06-24 19:27:37 +02:00
__init__.py	Merge branch 'develop' into asyncio	2018-06-24 19:27:37 +02:00