Dan acbbfabb27 Merge branch 'develop' into inline-mode ... # Conflicts: # compiler/api/compiler.py # compiler/error/source/400_BAD_REQUEST.tsv # pyrogram/__init__.py # pyrogram/client/dispatcher/dispatcher.py # pyrogram/client/ext/utils.py # pyrogram/client/methods/bots/__init__.py # pyrogram/client/types/__init__.py		2019-03-21 17:40:49 +01:00
..
source	Merge branch 'develop' into inline-mode	2019-03-21 17:40:49 +01:00
make.bat	Add documentation source files	2017-12-30 19:47:18 +01:00
Makefile	Restore original Makefile	2018-09-05 16:41:46 +02:00