summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2009-05-19 23:39:35 +0000
committerKaren Tracey <kmtracey@gmail.com>2009-05-19 23:39:35 +0000
commit3cd3df814da9227bd6f4d3a68271d04fd1e94c33 (patch)
tree45962cb06479c2a6206eec946d9d20c95ff5c75d /docs
parentcb73fe916eb241f486b1ec628a79356cbd323b0a (diff)
[1.0.X] Blocked r10826 from merge to branch as it's a fix to code added in a blocked changeset. Also replaced r10824 with r10822 in svnmerge-integrated as I believe that was the intent of r10825.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions