Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2

This commit is contained in:
Tom Christie 2012-09-27 13:06:34 +01:00
commit 89a0b22306

View File

@ -41,6 +41,7 @@ The following people have helped make REST framework great.
* Shawn Lewis - [shawnlewis]
* Alec Perkins - [alecperkins]
* Michael Barrett - [phobologic]
* Mathieu Dhondt - [laundromat]
Many thanks to everyone who's contributed to the project.
@ -104,3 +105,4 @@ To contact the author directly:
[shawnlewis]: https://github.com/shawnlewis
[alecperkins]: https://github.com/alecperkins
[phobologic]: https://github.com/phobologic
[laundromat]: https://github.com/laundromat