diff options
| author | Tom Christie | 2011-06-30 08:47:48 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-06-30 08:47:48 +0100 |
| commit | 5e2237149d8281e4b6112517849c106de340a3f4 (patch) | |
| tree | 0f2b43d5ea830548c770bca3a1e7624d6a5a1fbc /docs/conf.py | |
| parent | a1555cfd990f7cd70ea776fe74166f1595cc8201 (diff) | |
| parent | fb5f1323fdc4c3dabfca327b4abea87d0a5f2969 (diff) | |
| download | django-rest-framework-5e2237149d8281e4b6112517849c106de340a3f4.tar.bz2 | |
Fixing merge mess of hg-git ickyness.
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions