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
..
__init__.py	Update copyright year	2019-01-01 12:36:16 +01:00
base_client.py	Merge branch 'develop' into asyncio	2019-03-02 16:36:44 +01:00
chat_action.py	Update copyright year	2019-01-01 12:36:16 +01:00
emoji.py	Update copyright year	2019-01-01 12:36:16 +01:00
parse_mode.py	Update copyright year	2019-01-01 12:36:16 +01:00
syncer.py	Merge branch 'develop' into asyncio	2019-03-02 16:36:44 +01:00
utils.py	Merge branch 'develop' into asyncio	2019-01-02 19:55:45 +01:00