diff options
| author | Jens Alm | 2011-07-02 18:48:40 +0200 |
|---|---|---|
| committer | Jens Alm | 2011-07-02 18:48:40 +0200 |
| commit | 9baed0aed23ae56faceec26255a17ee0ee1f5af6 (patch) | |
| tree | ca5c9c28485d18356563837bf37be0c1a8260d22 | |
| parent | 3900abd37f69867f8624dd98529702229e9c1adf (diff) | |
| parent | 1885012d61c7ba78e78648ef2bff89e4337c0407 (diff) | |
| download | django-rest-framework-9baed0aed23ae56faceec26255a17ee0ee1f5af6.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Conflicts:
djangorestframework/views.py
Signed-off-by: Jens Alm <jens.alm@mac.com>
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -10,6 +10,7 @@ Michael Fötsch <mfoetsch> - File format support. David Larlet <david> - OAuth support. Andrew Straw <astraw> - Bugfixes. <zeth> - Bugfixes. +<fzunino> - Bugfixes. THANKS TO: |