From dc24e64d4f9956017eec56b1a5725ed581a1ec59 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Fri, 2 Sep 2016 09:59:10 +1000
Subject: [PATCH] Fixes catch-all URLs

---
 pinaxcon/urls.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 87de23e..f49d94b 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)