aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRyan Kaskel2013-05-18 14:04:27 +0100
committerRyan Kaskel2013-05-18 14:04:27 +0100
commit0b84c5a0acef23b0b9be920cfb8926c095ae9ac2 (patch)
tree59c1f02e9878a7114bbea0c3466f41b73636cb58 /docs
parent770ed3de2ef8339ec0b74f7eb522283718e01a3b (diff)
parenta0e3c44c99a61a6dc878308bdf0890fbb10c41e4 (diff)
downloaddjango-rest-framework-0b84c5a0acef23b0b9be920cfb8926c095ae9ac2.tar.bz2
Merge latest changes from master.
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/credits.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 8151b4d3..5998b4ca 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -124,6 +124,9 @@ The following people have helped make REST framework great.
* Marlon Bailey - [avinash240]
* James Summerfield - [jsummerfield]
* Andy Freeland - [rouge8]
+* Craig de Stigter - [craigds]
+* Pablo Recio - [pyriku]
+* Brian Zambrano - [brianz]
Many thanks to everyone who's contributed to the project.
@@ -284,3 +287,6 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[avinash240]: https://github.com/avinash240
[jsummerfield]: https://github.com/jsummerfield
[rouge8]: https://github.com/rouge8
+[craigds]: https://github.com/craigds
+[pyriku]: https://github.com/pyriku
+[brianz]: https://github.com/brianz