Dan 38e895ed82 Merge branch 'master' into new-api ... # Conflicts: # pyrogram/crypto/aes.py		2018-04-05 20:13:18 +02:00
..
style
__init__.py
chat_action.py
client.py	Merge branch 'master' into new-api	2018-04-05 20:13:18 +02:00
emoji.py
input_media.py
input_phone_contact.py
parse_mode.py
utils.py	Add new_chat_photo field	2018-04-05 11:17:40 +02:00