diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2014-01-23 20:21:11 +0000 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2014-01-23 20:21:11 +0000 |
| commit | 89df51803ef6e3990fbe7854818a3a3361639568 (patch) | |
| tree | 27e4b9655ee7d501efcce34f45153333f4b01097 /docs/_ext/djangodocs.py | |
| parent | 0b6b1ee24237e42cd4fb56c5995a88764a1833e8 (diff) | |
| parent | 8be9a250c190d9dd8615da4616cdfe401ad6e0af (diff) | |
| download | django-89df51803ef6e3990fbe7854818a3a3361639568.tar.gz | |
Merge branch 'stable/1.7.X'
We fork at beta. This branch will be recreated when the first beta is created.
It has been merged in to maintain the version number bump and tag.
Diffstat (limited to 'docs/_ext/djangodocs.py')
0 files changed, 0 insertions, 0 deletions