Commits

Luke Plant committed 1e2afc7 Merge

Merged from default

Comments (0)

Files changed (1)

     (r'^admin/', include(admin.site.urls)),
     (r'^officers/', include('cciw.officers.urls')),
     url('^autocomplete/(\w+)/$', autocomplete, name='autocomplete'),
-    (r'wiki/', include('djiki.urls')),
+    (r'^wiki/$', 'django.views.generic.simple.redirect_to', {'url': u'/wiki/Index'}),
+    (r'^wiki/', include('djiki.urls')),
 
 )