summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2010-07-17 09:31:09 +0000
committerKaren Tracey <kmtracey@gmail.com>2010-07-17 09:31:09 +0000
commitab693cea8096149302b3f4ecf8eede6a358a9621 (patch)
tree76e0ee9ee2f95669267a1d6a21ce5ea5e45f21f4 /scripts
parent1fed50033773e76eaa4bcf3c064a9e08899d405d (diff)
[1.2.X] Set svnmerge-integrated for 1.2.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions