summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2009-05-16 19:01:51 +0000
committerKaren Tracey <kmtracey@gmail.com>2009-05-16 19:01:51 +0000
commita04fd1ef30824cfe24e3cf43d1593f197a270bc9 (patch)
tree1012e7cbb6cf6b5af3091e533d3ef251ab6f26da /docs
parente21c85c58e2d7963fb141988fd7a918bf15e62ca (diff)
[1.0.X] Updated blocked and merged metadata for svnmerge.py.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions