diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-09 00:11:09 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-09 00:11:09 +0000 |
| commit | c058dfa9cdd75cf23ab24985d4aeb257da8f267f (patch) | |
| tree | 2d1915858c8a384d116427fcbc8803c3db92928f /docs/ref | |
| parent | 5e485a15ad07b492e648fe784ddd136d36ffcac4 (diff) | |
Corrected merge failure from r15455.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
0 files changed, 0 insertions, 0 deletions