aboutsummaryrefslogtreecommitdiffstats
path: root/examples/objectstore/urls.py
diff options
context:
space:
mode:
authorMarko Tibold2011-12-30 01:37:32 +0100
committerMarko Tibold2011-12-30 01:37:32 +0100
commit1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch)
tree9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /examples/objectstore/urls.py
parent91cee26ad89c04a70f33ae334150dd127f900474 (diff)
parenta0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff)
downloaddjango-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'examples/objectstore/urls.py')
-rw-r--r--examples/objectstore/urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/objectstore/urls.py b/examples/objectstore/urls.py
index 2c685f59..0a3effa7 100644
--- a/examples/objectstore/urls.py
+++ b/examples/objectstore/urls.py
@@ -1,7 +1,7 @@
from django.conf.urls.defaults import patterns, url
from objectstore.views import ObjectStoreRoot, StoredObject
-
+
urlpatterns = patterns('objectstore.views',
- url(r'^$', ObjectStoreRoot.as_view(), name='object-store-root'),
+ url(r'^$', ObjectStoreRoot.as_view(), name='object-store-root'),
url(r'^(?P<key>[A-Za-z0-9_-]{1,64})/$', StoredObject.as_view(), name='stored-object'),
)