diff options
| author | Craig Blaszczyk | 2011-12-11 18:30:43 +0000 |
|---|---|---|
| committer | Craig Blaszczyk | 2011-12-11 18:30:43 +0000 |
| commit | e84bf2140c33b45d1d9d8325eeaf62a97c46495e (patch) | |
| tree | d95d6755f787c8ab3d8c555315d514c067121bf9 /AUTHORS | |
| parent | 0632e946f977609ca6d6f4272f02c72dee1f49be (diff) | |
| parent | 4f42303035c094a1d0c6128f0ccce1abfa6b72f4 (diff) | |
| download | django-rest-framework-e84bf2140c33b45d1d9d8325eeaf62a97c46495e.tar.bz2 | |
fix merge
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -12,11 +12,13 @@ Andrew Straw <astraw> Zeth <zeth> Fernando Zunino <fzunino> Jens Alm <ulmus> -Craig Blaszczyk <jakul> +Craig Blaszczyk <jakul> Garcia Solero <garciasolero> Tom Drummond <devioustree> Danilo Bargen <gwrtheyrn> Andrew McCloud <amccloud> +Thomas Steinacher <thomasst> +Meurig Freeman <meurig> THANKS TO: |