Commit graph

8 commits

Author SHA1 Message Date
Jacob Bom
960862ccb1 Merge branch 'master' into october3
# Conflicts:
#	telegram/bot.py
#	telegram/callbackquery.py
#	telegram/chat.py
#	telegram/ext/messagehandler.py
#	telegram/inlinekeyboardbutton.py
#	telegram/inlinequeryresultcachedaudio.py
#	telegram/message.py
#	tests/test_filters.py
2016-10-19 12:35:50 +02:00
Noam Meltzer
17dae68654 gitignore: files generated by unitests 2016-01-04 00:32:17 +02:00
leandrotoledo
ce58f45c4f Adding .sublime 2015-09-09 09:12:35 -03:00
leandrotoledo
fa387d1821 Ignore coveralls token settings 2015-09-07 20:11:46 -03:00
Leandro Toledo
32c8f10652 Adding .gitignore back 2015-07-11 19:17:45 -03:00
JASON0916
8ca257ca61 simplify _requestUrl 2015-07-11 14:38:43 +08:00
Leandro Toledo
f7a15306a8 Adding sendPhoto method 2015-07-07 18:46:32 -03:00
Leandro Toledo
669cebd58b Initial commit 2015-07-07 12:30:39 -03:00