diff options
| author | Nikolaus Schlemm | 2013-05-18 17:13:59 +0200 |
|---|---|---|
| committer | Nikolaus Schlemm | 2013-05-18 17:13:59 +0200 |
| commit | b225b1d5c9cd8e2bec289f5da795637385b2cbe6 (patch) | |
| tree | fca92570fd7a056ed150b188c552d01d4c27dea5 /docs/topics/credits.md | |
| parent | a42afa04c38afe25c9032b8ce37b572678b02cf1 (diff) | |
| parent | 3f47eb7a77fcc735782dd1bf8e8e053e26417ea1 (diff) | |
| download | django-rest-framework-b225b1d5c9cd8e2bec289f5da795637385b2cbe6.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
Diffstat (limited to 'docs/topics/credits.md')
| -rw-r--r-- | docs/topics/credits.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 5998b4ca..d805c0c1 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -127,6 +127,9 @@ The following people have helped make REST framework great. * Craig de Stigter - [craigds] * Pablo Recio - [pyriku] * Brian Zambrano - [brianz] +* Òscar Vilaplana - [grimborg] +* Ryan Kaskel - [ryankask] +* Andy McKay - [andymckay] Many thanks to everyone who's contributed to the project. @@ -290,3 +293,6 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [craigds]: https://github.com/craigds [pyriku]: https://github.com/pyriku [brianz]: https://github.com/brianz +[grimborg]: https://github.com/grimborg +[ryankask]: https://github.com/ryankask +[andymckay]: https://github.com/andymckay |