Dan e2224054d2 Merge branch 'remove-handler-and-locks' of https://github.com/JosXa/pyrogram into JosXa-remove-handler-and-locks ... # Conflicts: # pyrogram/client/dispatcher/dispatcher.py		2018-04-30 10:30:34 +02:00
..
api	Initial support for Reply Markups	2018-04-27 19:04:16 +02:00
client	Merge branch 'remove-handler-and-locks' of https://github.com/JosXa/pyrogram into JosXa-remove-handler-and-locks	2018-04-30 10:30:34 +02:00
connection	Make proxy loading simpler	2018-04-13 12:30:13 +02:00
crypto	Revert "Remove old code and use a better error message"	2018-04-02 10:02:30 +02:00
session	Join net worker threads before stopping. Fixes #62	2018-04-29 20:30:32 +02:00
__init__.py	Add callback query support	2018-04-28 23:48:38 +02:00