summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMarc Fargas <telenieko@telenieko.com>2008-11-06 08:49:03 +0000
committerMarc Fargas <telenieko@telenieko.com>2008-11-06 08:49:03 +0000
commit9c3e9c7e65ffa9ace25c8f6a8056dafebf711efc (patch)
tree1574f328ffa99579ad8ffc300d71aff4c01b8b6d /docs
parentdcfafea408a6eec2d35f9bc2f7aaff724ceee36f (diff)
Merge branch 'master-1.0.X' into trunk-1.0.X
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions