Merge branch 'xates-choose-config-file' into develop

Browse Source

# Conflicts:
#	pyrogram/client/client.py

...

This commit is contained in:

Dan 2018-05-11 12:51:24 +02:00

parent 9bb8fe55da fe2a8e6663

commit 9e4c53f948

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available