diff options
| author | Tom Christie | 2014-08-19 10:11:10 +0100 | 
|---|---|---|
| committer | Tom Christie | 2014-08-19 10:11:10 +0100 | 
| commit | e385a7b8eb6e538698f28128e43fe8bfaefd4e97 (patch) | |
| tree | 3f1cac50c40ec77a0bc5537f1a04628901a4d2ce /docs/api-guide/viewsets.md | |
| parent | 2aad8e4b35c3552a065347d7eccad8bd51938783 (diff) | |
| parent | 48b66ec2a2b744f170034adbdaaa1588e6c14e11 (diff) | |
| download | django-rest-framework-e385a7b8eb6e538698f28128e43fe8bfaefd4e97.tar.bz2 | |
Merge master
Diffstat (limited to 'docs/api-guide/viewsets.md')
| -rw-r--r-- | docs/api-guide/viewsets.md | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index dc5d01a2..b32f5a80 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -151,7 +151,7 @@ The `@action` decorator will route `POST` requests by default, but may also acce          @detail_route(methods=['post', 'delete'])          def unset_password(self, request, pk=None):             ... -            +  The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$`  --- | 
