encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-03-03 19:00:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/robromano/django-rest-framework

Browse Source 
Conflicts:
	docs/api-guide/authentication.md
	docs/topics/credits.md
This commit is contained in:
Rob Romano 2012-11-14 13:01:43 -08:00
commit d541e0c423
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/topics/credits.md
View File

@ -157,4 +157,3 @@ To contact the author directly:
[glic3rinu]: https://github.com/glic3rinu [glic3rinu]: https://github.com/glic3rinu
[ludwigkraatz]: https://github.com/ludwigkraatz [ludwigkraatz]: https://github.com/ludwigkraatz
[robromano]: https://github.com/robromano [robromano]: https://github.com/robromano