]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d211231 60adf95)
#4783: Merge with 3.1.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 04:39:08 +0000 (07:39 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 15 Apr 2011 04:39:08 +0000 (07:39 +0300)
1  2 
Doc/library/json.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/json.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.