aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
diff options
context:
space:
mode:
authorTom Christie2013-06-10 09:06:15 +0100
committerTom Christie2013-06-10 09:06:15 +0100
commit351e172d4568e39df9760f989eb976c726e604ce (patch)
treef9b605effe6b71aedb0d687062f00a46373bde6c /docs/topics
parent777ecb5141d5d4f1a6b4e10e376965148022822c (diff)
parent5ce1d6c86bb0831916ba4137560d84295ac7ec95 (diff)
downloaddjango-rest-framework-351e172d4568e39df9760f989eb976c726e604ce.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 db522922..b4bd3561 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -140,6 +140,7 @@ The following people have helped make REST framework great.
* Alex Burgel - [aburgel]
* David Medina - [copitux]
* Areski Belaid - [areski]
+* Ethan Freman - [mindlace]
Many thanks to everyone who's contributed to the project.
@@ -316,3 +317,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[aburgel]: https://github.com/aburgel
[copitux]: https://github.com/copitux
[areski]: https://github.com/areski
+[mindlace]: https://github.com/mindlace