summaryrefslogtreecommitdiff
path: root/nop
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-05-27 20:03:04 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-05-27 20:03:04 (GMT)
commit4a66728a9bbe88704c6e01ec8dd683cdb0a4c0c6 (patch)
tree9c62c09230aec03187cc13d2ac78d299bd96096b /nop
parenta1487772e667436e2274dece86cb40d2e58632a7 (diff)
parentc27b374386463c56f41815869d6209f9a422b858 (diff)
Merge branch 'master' into stable
Diffstat (limited to 'nop')
-rw-r--r--nop/urls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nop/urls.py b/nop/urls.py
index 3cc97a4..392d633 100644
--- a/nop/urls.py
+++ b/nop/urls.py
@@ -10,4 +10,4 @@ urlpatterns = patterns('',
url(r'^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<hour>\d{1,2})/(?P<minute>\d{1,2})/?$', get),
url(r'^/?$', nop_form),
url(r'^/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': NOP_SITE_MEDIA}),
-)
+ )