From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 23 Aug 2013 13:10:39 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~46^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c381d920d9a359eab2b11cb15e88ab1f4e55a82e

Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

Conflicts:
	portal/urls.py
---

c381d920d9a359eab2b11cb15e88ab1f4e55a82e
diff --cc portal/urls.py
index a57c5fd1,229974cd..2887388a
--- a/portal/urls.py
+++ b/portal/urls.py
@@@ -22,8 -22,7 +22,7 @@@
  
  from django.conf.urls import patterns, include, url
  from portal           import views
- from portal.views     import  DashboardView, PresViewView
- from portal.views     import DashboardView, PresViewView, PlatformsView, PlatformView
 -from portal.views     import DashboardView, PresViewView, PlatformsView, ValidatePendingView # UserRegisterView, UserValidateView
++from portal.views     import DashboardView, PresViewView, PlatformsView, PlatformView, ValidatePendingView # UserRegisterView, UserValidateView
  from portal.util      import TemplateView
  
  # DEPRECATED #named_register_forms = (