From d354dc091117bbd93241a2a0e6672b6e53b7379c Mon Sep 17 00:00:00 2001
From: Mariatta <mariatta@python.org>
Date: Sun, 17 Mar 2019 16:13:03 -0700
Subject: [PATCH 1/2] Release 1.3.1

---
 cherry_picker/cherry_picker/__init__.py | 2 +-
 cherry_picker/readme.rst                | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cherry_picker/cherry_picker/__init__.py b/cherry_picker/cherry_picker/__init__.py
index ff9e87e..600bff6 100644
--- a/cherry_picker/cherry_picker/__init__.py
+++ b/cherry_picker/cherry_picker/__init__.py
@@ -1,2 +1,2 @@
 """Backport CPython changes from master to maintenance branches."""
-__version__ = '1.3.1.dev1'
+__version__ = '1.3.1'
diff --git a/cherry_picker/readme.rst b/cherry_picker/readme.rst
index b63923b..5ed541b 100644
--- a/cherry_picker/readme.rst
+++ b/cherry_picker/readme.rst
@@ -338,6 +338,13 @@ Changelog
 1.3.1 (in development)
 ----------------------
 
+- Modernize cherry_picker's pyproject.toml file. (`PR #316 <https://github.com/python/core-workflow/pull/316>`_)
+
+- Remove the ``BACKPORT_COMPLETE`` state. Unset the states when backport is completed.
+  (`PR #315 <https://github.com/python/core-workflow/pull/315>`_)
+
+- Run Travis CI test on Windows (`PR #311 <https://github.com/python/core-workflow/pull/311>`_).
+
 1.3.0
 -----
 

From 5e60b229027ac70b0a68dd4d36ac68f9bee53fd4 Mon Sep 17 00:00:00 2001
From: Mariatta <mariatta@python.org>
Date: Sun, 17 Mar 2019 16:21:28 -0700
Subject: [PATCH 2/2] merge conflict wasn't resolved properly

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8da56be..dbbb54e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 conditions: v1
 
+git:
+  depth: false
+
 language: python
 
 dist: trusty