credits.md
5.19 KB
-
Merge branch 'master' of https://github.com/robromano/django-rest-framework · d541e0c4
Conflicts: docs/api-guide/authentication.md docs/topics/credits.md
Rob Romano committed
Conflicts: docs/api-guide/authentication.md docs/topics/credits.md