From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 23 Aug 2013 12:37:42 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~48
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=bfaf128417660246d7e5916129886bfbd3a878b0

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

Conflicts:
	portal/urls.py
---

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