X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5780495e13ec2d55bc2dee96dec372a9ea395462..refs/heads/backend-rewrite:/redakcja/urls.py?ds=inline diff --git a/redakcja/urls.py b/redakcja/urls.py index 191bcc2a..af85e5ce 100644 --- a/redakcja/urls.py +++ b/redakcja/urls.py @@ -19,7 +19,8 @@ urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), - url(r'^documents/', include('wiki.urls')), + url(r'^wiki/', include('newwiki.urls')), + url(r'^storage/', include('dvcs.urls')), # Static files (should be served by Apache) url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', @@ -28,7 +29,6 @@ urlpatterns = patterns('', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), - (r'^documents/', include(wiki.urls)), - url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/documents/'}), + url(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/wiki/', 'permanent': False}), )