Dan 02a1dde399 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/client/client.py # pyrogram/client/methods/chats/join_chat.py # pyrogram/client/methods/messages/edit_message_media.py		2019-03-02 16:36:44 +01:00
..
bots	Fix asyncio merge	2019-01-07 22:57:19 +01:00
chats	Merge branch 'develop' into asyncio	2019-03-02 16:36:44 +01:00
contacts	Merge branch 'develop' into asyncio	2019-02-07 16:20:03 +01:00
decorators	Update copyright year	2019-01-01 12:36:16 +01:00
messages	Merge branch 'develop' into asyncio	2019-03-02 16:36:44 +01:00
password	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
users	Merge branch 'develop' into asyncio	2019-03-02 16:36:44 +01:00
__init__.py	Update copyright year	2019-01-01 12:36:16 +01:00