bakatrouble 952f0627f1 Merge branch 'develop' into session_storage ... # Conflicts: # pyrogram/client/client.py # pyrogram/client/ext/base_client.py # pyrogram/client/ext/syncer.py # pyrogram/client/style/html.py # pyrogram/client/style/markdown.py		2019-04-14 21:49:45 +03:00
..
__init__.py	Update copyright year	2019-01-01 12:36:16 +01:00
html.py	Merge branch 'develop' into session_storage	2019-04-14 21:49:45 +03:00
markdown.py	Merge branch 'develop' into session_storage	2019-04-14 21:49:45 +03:00
utils.py	Update copyright year	2019-01-01 12:36:16 +01:00