diff options
| author | Tom Christie | 2012-09-27 13:34:48 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-09-27 13:34:48 +0100 |
| commit | 4d906938a9304be119a9b15f6540a8cbab6f1154 (patch) | |
| tree | fea0eab18d3013d7ebdc232dd68725dee4c34524 /rest_framework/generics.py | |
| parent | 284a700e09708355676fb703e57f592352230784 (diff) | |
| parent | 8582b18ac4f7258acd559c3deac21cee9ae7727d (diff) | |
| download | django-rest-framework-4d906938a9304be119a9b15f6540a8cbab6f1154.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'rest_framework/generics.py')
0 files changed, 0 insertions, 0 deletions