summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@rd.io>2012-11-04 15:58:54 -0800
committerAlex Gaynor <alex.gaynor@rd.io>2012-11-04 15:58:54 -0800
commitd35b95c2f45bc5bc91deab12e503b04126fe70d7 (patch)
treed0a2900d1a8a9d75bee1c5912cb0ae3fa948d000 /docs
parentd828d4e186b5433f637b86c4e44a3b68acab5cb8 (diff)
parentb85cb92ba97a67cd6e0893be05ffbc6c65b4f83f (diff)
Merge branch 'stable/1.5.x' of https://github.com/django/django into stable/1.5.x
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions