aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
diff options
context:
space:
mode:
authorTom Christie2013-04-03 09:21:04 +0100
committerTom Christie2013-04-03 09:21:04 +0100
commita18d3df0f60ac4d5ad981b2d463f8408b44286ff (patch)
tree8d6e881587a83fa843141a3f6cd84040dbd43e88 /docs/topics
parent74fbd5ccc5b2aa2f0aab25ead5ffa36024079fcf (diff)
parent5ed70324273d8093335f21155975267b22a641d2 (diff)
downloaddjango-rest-framework-a18d3df0f60ac4d5ad981b2d463f8408b44286ff.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 7dd9cd2c..6edf347e 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -113,6 +113,7 @@ The following people have helped make REST framework great.
* Pierre Dulac - [dulaccc]
* Dave Kuhn - [kuhnza]
* Sitong Peng - [stoneg]
+* Victor Shih - [vshih]
Many thanks to everyone who's contributed to the project.
@@ -260,3 +261,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[dulaccc]: https://github.com/dulaccc
[kuhnza]: https://github.com/kuhnza
[stoneg]: https://github.com/stoneg
+[vshih]: https://github.com/vshih