aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Tibold2011-12-30 16:40:06 +0100
committerMarko Tibold2011-12-30 16:40:06 +0100
commit0bf89f267e976a976ceeaaf353e7acbba0a6bf4d (patch)
tree3525c1c653b7d08f72df8dd03568c6acdab755e5
parentb137b5ee5606a182dab4ff68a29f805b72e81ad3 (diff)
parent615e8d7e77764d26cf1e6f305b2362b2cafd4f29 (diff)
downloaddjango-rest-framework-0bf89f267e976a976ceeaaf353e7acbba0a6bf4d.tar.bz2
Merge remote-tracking branch 'upstream/master'
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index c1ed3661..5a2bc165 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Thomas Steinacher <thomasst>
Meurig Freeman <meurig>
Anthony Nemitz <anemitz>
Ewoud Kohl van Wijngaarden <ekohl>
+Michael Ding <yandy>
THANKS TO: