aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/urls.py
diff options
context:
space:
mode:
authorMarko Tibold2012-11-15 22:48:22 +0100
committerMarko Tibold2012-11-15 22:48:22 +0100
commit403886b79b9bf5790ee6f07d6ca915cff5b3035a (patch)
tree987db12d60d8dbf56d8f23ff694d7208df6e3184 /rest_framework/urls.py
parent69a01d71256b9923aac1b8d1b91063068ecfebf7 (diff)
parent3b258d69c92e9d9293f7c5d1690f0ca434e677e3 (diff)
downloaddjango-rest-framework-403886b79b9bf5790ee6f07d6ca915cff5b3035a.tar.bz2
Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into file_and_image_fields
Diffstat (limited to 'rest_framework/urls.py')
-rw-r--r--rest_framework/urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/urls.py b/rest_framework/urls.py
index 1a81101f..bcdc23e7 100644
--- a/rest_framework/urls.py
+++ b/rest_framework/urls.py
@@ -1,7 +1,7 @@
"""
-Login and logout views for the browseable API.
+Login and logout views for the browsable API.
-Add these to your root URLconf if you're using the browseable API and
+Add these to your root URLconf if you're using the browsable API and
your API requires authentication.
The urls must be namespaced as 'rest_framework', and you should make sure