Dan 2084a406a4 Merge branch 'develop' into asyncio ... # Conflicts: # pyrogram/__init__.py # pyrogram/client/client.py # pyrogram/client/ext/base_client.py # pyrogram/client/methods/chats/get_chat_members.py # pyrogram/client/methods/chats/get_dialogs.py # pyrogram/client/methods/chats/kick_chat_member.py # pyrogram/client/methods/messages/get_history.py # pyrogram/client/methods/messages/get_messages.py # pyrogram/client/types/messages_and_media/messages.py		2019-01-07 08:46:28 +01:00
..
bots	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
chats	Merge branch 'develop' into asyncio	2019-01-07 08:46:28 +01:00
contacts	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
decorators	Update copyright year	2019-01-01 12:36:16 +01:00
messages	Merge branch 'develop' into asyncio	2019-01-07 08:46:28 +01:00
password	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
users	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00
__init__.py	Update copyright year	2019-01-01 12:36:16 +01:00