Merge branch 'master' of git://github.com/tomchristie/django-rest-framework

This commit is contained in:
Jacob Magnusson 2012-11-04 12:52:11 +01:00
commit bd5a3ee7d5

View File

@ -53,6 +53,7 @@ The following people have helped make REST framework great.
* Stephan Groß - [minddust]
* Pavel Savchenko - [asfaltboy]
* Otto Yiu - [ottoyiu]
* Jacob Magnusson - [jmagnusson]
Many thanks to everyone who's contributed to the project.
@ -141,3 +142,4 @@ To contact the author directly:
[minddust]: https://github.com/minddust
[asfaltboy]: https://github.com/asfaltboy
[ottoyiu]: https://github.com/OttoYiu
[jmagnusson]: https://github.com/jmagnusson