diff options
| author | GitHub Merge Button | 2011-05-02 12:02:23 -0700 |
|---|---|---|
| committer | GitHub Merge Button | 2011-05-02 12:02:23 -0700 |
| commit | fb5f1323fdc4c3dabfca327b4abea87d0a5f2969 (patch) | |
| tree | fd77b84187df9dcf0b78722f7fb62fb8a6c1c75f /docs/conf.py | |
| parent | b508ca38d44f458e3eabaa4ffd3500d80a71eb9e (diff) | |
| parent | 127c5b413c6fc3995d539d000ecea15cea8e3389 (diff) | |
| download | django-rest-framework-fb5f1323fdc4c3dabfca327b4abea87d0a5f2969.tar.bz2 | |
Merge 127c5b413c6fc3995d539d000ecea15cea8e3389 into b508ca38d44f458e3eabaa4ffd3500d80a71eb9e
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions