diff options
| author | Wookey <wookey@wookware.org> | 2014-06-26 02:37:55 +0100 |
|---|---|---|
| committer | Wookey <wookey@wookware.org> | 2014-06-26 02:37:55 +0100 |
| commit | 8cad25ecc448a48dcbddf11ef295c31a4f44d819 (patch) | |
| tree | 44fb78b3cfa82a3a6483a7c4ae27a62014baf18b | |
| parent | 01d4efccdd59e603680525dc3a842b9dcfafec15 (diff) | |
| parent | 011fa3acb3c77f18a9c46c58228c12e97d92aab0 (diff) | |
| download | troggle-8cad25ecc448a48dcbddf11ef295c31a4f44d819.tar.gz troggle-8cad25ecc448a48dcbddf11ef295c31a4f44d819.tar.bz2 troggle-8cad25ecc448a48dcbddf11ef295c31a4f44d819.zip | |
merge in survex parsing changes from server.
| -rw-r--r-- | urls.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -143,12 +143,12 @@ actualurlpatterns = patterns('', url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"), # (r'^gallery/(?P<path>.*)$', 'django.views.static.serve', - # {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), +# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), # for those silly ideas - url(r'^experimental.*$', views_logbooks.experimental, name="experimental"), + url(r'^experimental.*$', views_logbooks.experimental, name="experimental"), - #url(r'^trip_report/?$',views_other.tripreport,name="trip_report") + #url(r'^trip_report/?$',views_other.tripreport,name="trip_report") url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"), url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"), |