]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85a2522 6d2bc6e)
#17438: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 29 Mar 2013 02:02:14 +0000 (04:02 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 29 Mar 2013 02:02:14 +0000 (04:02 +0200)
1  2 
Doc/library/json.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/json.rst
Simple merge
Mirror of https://github.com/python/cpython.git