aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
diff options
context:
space:
mode:
authorTom Christie2013-05-14 21:41:39 +0100
committerTom Christie2013-05-14 21:41:39 +0100
commit2f54decd3e32497db2d17b1723500f8d764459f6 (patch)
tree10d2bb78d6815a2f1f5647c80e3cbd220a58dcf1 /docs/topics
parente939e1755a94b50c87a82c0f777645e28fe91bf0 (diff)
parent599c0eb0db1efc194049ffcec5c5c5b457f63647 (diff)
downloaddjango-rest-framework-2f54decd3e32497db2d17b1723500f8d764459f6.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/credits.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 097dec7f..482f75d2 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -122,6 +122,7 @@ The following people have helped make REST framework great.
* Daniel Hepper - [dhepper]
* Hamish Campbell - [hamishcampbell]
* Marlon Bailey - [avinash240]
+* James Summerfield - [jsummerfield]
Many thanks to everyone who's contributed to the project.
@@ -280,3 +281,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[dhepper]: https://github.com/dhepper
[hamishcampbell]: https://github.com/hamishcampbell
[avinash240]: https://github.com/avinash240
+[jsummerfield]: https://github.com/jsummerfield