Skip to content

Commit de2d732

Browse files
committed
Merge branch 'master' into jobqueue-rework
Conflicts: README.rst telegram/ext/commandhandler.py telegram/ext/messagehandler.py
2 parents d40f0a8 + f8a9722 commit de2d732

36 files changed

+710
-633
lines changed

CHANGES.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
**2016-05-28**
2+
3+
*Released 4.2*
4+
5+
- Implement Bot API 2.1
6+
- Move ``botan`` module to ``telegram.contrib``
7+
- New exception type: ``BadRequest``
8+
19
**2016-05-22**
210

311
*Released 4.1.2*
@@ -37,7 +45,7 @@
3745

3846
- Implement Bot API 2.0
3947
- Almost complete recode of ``Dispatcher``
40-
- Please read the `Transistion Guide to 4.0 <https://github.com/python-telegram-bot/python-telegram-bot/wiki/Transistion-guide-to-Version-4.0>`_
48+
- Please read the `Transition Guide to 4.0 <https://github.com/python-telegram-bot/python-telegram-bot/wiki/Transition-guide-to-Version-4.0>`_
4149
- **Changes from 4.0rc1**
4250
- The syntax of filters for ``MessageHandler`` (upper/lower cases)
4351
- Handler groups are now identified by ``int`` only, and ordered

0 commit comments

Comments
 (0)