From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 6 Mar 2018 18:58:22 +0000 (-0500)
Subject: cherry-pick changelog update for 1.2.6
X-Git-Tag: rel_1_3_0b1~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7b55967baac85bd8a76ab582787d21de191e89a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cherry-pick changelog update for 1.2.6
---

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index c85380bbf8..40faddee7a 100644
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -10,6 +10,10 @@
     .. include:: changelog_10.rst
         :start-line: 5
 
+.. changelog::
+    :version: 1.2.6
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.5
     :released: March 6, 2018