summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-03-06 13:58:22 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2018-03-06 13:58:22 -0500
commitf7b55967baac85bd8a76ab582787d21de191e89a (patch)
treeb78f2bc81a8b3f33cd3c7af908f1c1068efefa09
parente5f9de3aa7300c7ab20c71527f2dbe31c0621cad (diff)
downloadsqlalchemy-f7b55967baac85bd8a76ab582787d21de191e89a.tar.gz
cherry-pick changelog update for 1.2.6
-rw-r--r--doc/build/changelog/changelog_12.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index c85380bbf..40faddee7 100644
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -11,6 +11,10 @@
:start-line: 5
.. changelog::
+ :version: 1.2.6
+ :include_notes_from: unreleased_12
+
+.. changelog::
:version: 1.2.5
:released: March 6, 2018