summaryrefslogtreecommitdiff
path: root/docs/_ext
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-12-16 14:26:02 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-12-16 14:26:02 +0000
commit8cc518a96432644596dba5167bacd694bbf7ab4a (patch)
tree235a92f29d42d5a518a0aefd8839dabd3ebdd7a8 /docs/_ext
parent01e04e90e0f69e3b350301015f17a6cb4aa7d39a (diff)
[1.0.X] Block r9643 (code removal) and r9646 (fix to code present only in trunk) from svnmerge.py consideration.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/_ext')
0 files changed, 0 insertions, 0 deletions