projects / services / python-requests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a721d59 0c09d16)
Merge remote-tracking branch 'upstream/master'
authorsprt <hellosprt@gmail.com>
Wed, 23 Jan 2013 13:42:45 +0000 (14:42 +0100)
committersprt <hellosprt@gmail.com>
Wed, 23 Jan 2013 13:42:45 +0000 (14:42 +0100)
Conflicts:
requests/sessions.py

1  2 
requests/models.py patch | diff1 | diff2 | blob | history
requests/sessions.py patch | diff1 | diff2 | blob | history
test_requests.py patch | diff1 | diff2 | blob | history

diff --cc requests/models.py
Simple merge
diff --cc requests/sessions.py
Simple merge
diff --cc test_requests.py
Simple merge
Domain: SCM / CI Services;