Jannes Höke d46d9a711d Merge branch 'bot-api-2.0' into dispatcher-rework ... Conflicts: docs/source/telegram.ext.jobqueue.rst docs/source/telegram.rst		2016-04-22 16:12:45 +02:00
..
source	Merge branch 'bot-api-2.0' into dispatcher-rework	2016-04-22 16:12:45 +02:00
Makefile	Adding docs	2015-08-11 16:17:38 -03:00
requirements-docs.txt	Improving the design of existing Telegram classes	2015-08-28 17:45:44 -03:00