File diff 1df509cfbbff → 3a686ab1a82e
pinaxcon/urls.py
Show inline comments
...
 
@@ -6,6 +6,9 @@ from django.views.generic import TemplateView
 
from wagtail.wagtailadmin import urls as wagtailadmin_urls
 
from wagtail.wagtailcore import urls as wagtail_urls
 

	
 
from wiki.urls import get_pattern as get_wiki_pattern
 
from django_nyt.urls import get_pattern as get_nyt_pattern
 

	
 
from django.contrib import admin
 

	
 
import symposion.views
...
 
@@ -36,6 +39,10 @@ urlpatterns = [
 
    url(r'^tickets/', include('registrasion.urls')),
 
    url(r'^nested_admin/', include('nested_admin.urls')),
 

	
 
    # Wiki
 
    url(r'^notifications/', get_nyt_pattern()),
 
    url(r'^wiki/', get_wiki_pattern()),
 

	
 
    # Default catch-all for wagtail pages.
 
    url(r'^', include(wagtail_urls)),