Put back newlines in Conflict responses.
[pithos] / pithos / urls.py
index 17cc94b..9eacb83 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 2011 GRNET S.A. All rights reserved.
+# Copyright 2011-2012 GRNET S.A. All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -38,6 +38,6 @@ urlpatterns = patterns('',
     (r'^v1(?:$|/)', include('pithos.api.urls')),
     (r'^v1\.0(?:$|/)', include('pithos.api.urls')),
     (r'^public/(?P<v_public>.+?)/?$', 'pithos.api.public.public_demux'),
-    (r'^im/', include('pithos.im.urls')),
+    (r'^login/?$', 'pithos.api.login.redirect_to_login_service'),
     (r'^ui', include('pithos.ui.urls'))
 )