Merge public app into api.

[pithos] / pithos / urls.py

diff --git a/pithos/urls.py b/pithos/urls.py
index dea4a01..17cc94b 100644 (file)
--- a/pithos/urls.py
+++ b/pithos/urls.py
@@ -37,7 +37,7 @@ from django.conf.urls.defaults import include, patterns
 urlpatterns = patterns('',
     (r'^v1(?:$|/)', include('pithos.api.urls')),
     (r'^v1\.0(?:$|/)', include('pithos.api.urls')),
-    (r'^public(?:$|/)', include('pithos.public.urls')),
+    (r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'),
     (r'^im/', include('pithos.im.urls')),
     (r'^ui', include('pithos.ui.urls'))
 )