From 38a33581b13834742c0c57a30cc3e5517f3a001c Mon Sep 17 00:00:00 2001
From: Hinrich Mahler <hinrich.mahler@freenet.de>
Date: Fri, 10 Apr 2020 23:52:08 +0200
Subject: [PATCH] Bump version to v12.6

---
 CHANGES.rst         | 29 +++++++++++++++++++++++++++++
 docs/source/conf.py |  4 ++--
 telegram/version.py |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b895e79ba..6551c9f31 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,35 @@
 Changelog
 =========
 
+Version 12.6
+============
+*Released 2020-04-10*
+
+**Major Changes:**
+
+- Bot API 4.7 support. **Note:** In ``Bot.create_new_sticker_set`` and ``Bot.add_sticker_to_set``, the order of the parameters had be changed, as the ``png_sticker`` parameter is now optional. (`#1858`_)
+
+**Minor changes, CI improvements or bug fixes:**
+
+- Add tests for ``swtich_inline_query(_current_chat)`` with empty string (`#1635`_)
+- Doc fixes (`#1854`_, `#1874`_, `#1884`_)
+- Update issue templates (`#1880`_)
+- Favor concrete types over "Iterable" (`#1882`_)
+- Pass last valid ``CallbackContext`` to ``TIMEOUT`` handlers of ``ConversationHandler`` (`#1826`_)
+- Tweak handling of persistence and update persistence after job calls (`#1827`_)
+- Use checkout@v2 for GitHub actions (`#1887`_)
+
+.. _`#1858`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1858
+.. _`#1635`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1635
+.. _`#1854`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1854
+.. _`#1874`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1874
+.. _`#1884`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1884
+.. _`#1880`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1880
+.. _`#1882`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1882
+.. _`#1826`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1826
+.. _`#1827`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1827
+.. _`#1887`: https://github.com/python-telegram-bot/python-telegram-bot/pull/1887
+
 Version 12.5.1
 ==============
 *Released 2020-03-30*
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 1cbd15f6d..6ae6bbb37 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -58,9 +58,9 @@ author = u'Leandro Toledo'
 # built documents.
 #
 # The short X.Y version.
-version = '12.5'  # telegram.__version__[:3]
+version = '12.6'  # telegram.__version__[:3]
 # The full version, including alpha/beta/rc tags.
-release = '12.5.1'  # telegram.__version__
+release = '12.6'  # telegram.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/telegram/version.py b/telegram/version.py
index 5058ffa12..f94836ce1 100644
--- a/telegram/version.py
+++ b/telegram/version.py
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 
-__version__ = '12.5.1'
+__version__ = '12.6'