diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 87de23ea41c4d50d0e2101ad837f6018b2f57681..f49d94b18da2e4d9bf83c28255a8f0311a8b2124 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -24,15 +24,17 @@ urlpatterns = [ url(r"^teams/", include("symposion.teams.urls")), - url(r"^boxes/", include("pinax.boxes.urls")), - url(r"^", include("pinax.pages.urls")), - # Required by registrasion url(r'^register/', include('registrasion.urls')), url(r'^nested_admin/', include('nested_admin.urls')), # Demo payment gateway and related features url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")), + + url(r"^boxes/", include("pinax.boxes.urls")), + + # Catch-all MUST go last. + #url(r"^", include("pinax.pages.urls")), ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)