aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-05-18 21:13:19 +0100
committerTom Christie2013-05-18 21:13:19 +0100
commit5ed3f59a2c5ed41c56cd47ec25dc196f3c8a3c54 (patch)
treee1f5711c271ef0d32a6adf11f302ae945c03c102
parent4631b91e144ae758b4417f20b0379ce5b9179ee6 (diff)
parent351814e110d642bf1351b95141924190e56d9694 (diff)
downloaddjango-rest-framework-5ed3f59a2c5ed41c56cd47ec25dc196f3c8a3c54.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
-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 0e206de8..acd6576e 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -131,6 +131,7 @@ The following people have helped make REST framework great.
* Ryan Kaskel - [ryankask]
* Andy McKay - [andymckay]
* Matteo Suppo - [matteosuppo]
+* Karol Majta - [lolek09]
Many thanks to everyone who's contributed to the project.
@@ -298,3 +299,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[ryankask]: https://github.com/ryankask
[andymckay]: https://github.com/andymckay
[matteosuppo]: https://github.com/matteosuppo
+[lolek09]: https://github.com/lolek09