aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2020-11-26 15:38:21 +0200
committerMatti Picus <matti.picus@gmail.com>2020-11-26 15:38:21 +0200
commitbc71ba80d5949bac00556780692249cf3b189d89 (patch)
treea282b20c6890c85c333f33333e0cd22bd3d491af /pypy/doc/whatsnew-pypy3-head.rst
parentmerge issue3348 which fixes utf_8_decode for final=False (diff)
downloadpypy-bc71ba80d5949bac00556780692249cf3b189d89.tar.gz
pypy-bc71ba80d5949bac00556780692249cf3b189d89.tar.bz2
pypy-bc71ba80d5949bac00556780692249cf3b189d89.zip
document merged branches
Diffstat (limited to 'pypy/doc/whatsnew-pypy3-head.rst')
-rw-r--r--pypy/doc/whatsnew-pypy3-head.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
index 56054cdabf..9782d18edb 100644
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -7,3 +7,10 @@ What's new in PyPy3 7.3.3+
.. branch: py3.6-resync
+.. branch: fix-crypt-py3-import
+
+Fix bad merge of crypt cffi module
+
+.. branch: issue3348
+
+Fix utf_8_decode for final=False, error=ignore