Jeff e9d08c6f7a Merge branch 'master' into paymenthandlers-new ... # Conflicts: # telegram/bot.py # telegram/message.py # telegram/precheckoutquery.py # telegram/shippingquery.py		2017-06-03 01:09:17 +08:00
..
__init__.py	Add both handlers for queries from new Payment API (#630)	2017-05-22 14:07:53 +02:00
callbackqueryhandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
choseninlineresulthandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
commandhandler.py	Improved CommandHandler (#613)	2017-05-19 20:21:37 +02:00
conversationhandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
dispatcher.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
filters.py	Merge branch 'master' into paymenthandlers-new	2017-06-03 01:09:17 +08:00
handler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
inlinequeryhandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
jobqueue.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
messagehandler.py	Allow edited as seperate input (#608)	2017-05-19 20:26:10 +02:00
messagequeue.py	Issue 566 (#577)	2017-04-25 10:37:06 +02:00
precheckoutqueryhandler.py	Add both handlers for queries from new Payment API (#630)	2017-05-22 14:07:53 +02:00
regexhandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
shippingqueryhandler.py	Add both handlers for queries from new Payment API (#630)	2017-05-22 14:07:53 +02:00
stringcommandhandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
stringregexhandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
typehandler.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00
updater.py	Update copyright notice to include 2017	2017-05-15 00:36:49 +03:00