From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 21 Feb 2014 13:39:32 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~325
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fb88f8872d47629d6605e97300c0d4c474a82803;hp=8f6adfe5f09c6e07d8e755f82e3cb4a577ebfe71;p=myslice.git

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

diff --git a/portal/urls.py b/portal/urls.py
index 790e927d..c7b7de56 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,6 +23,7 @@
 from django.views.generic.base   import TemplateView
 from django.conf.urls           import patterns, include, url
 
+from portal.about               import AboutView
 from portal.usersview           import UsersView
 from portal.manageuserview      import UserView, user_process    
 from portal.platformsview       import PlatformsView
@@ -61,6 +62,7 @@ urlpatterns = patterns('',
     url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
     #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'),
     url(r'^account/?$', AccountView.as_view(), name='account'),
+    url(r'^about/?$', AboutView.as_view(), name='about'),
     url(r'^users/?$', UsersView.as_view(), name='user_list'),
     url(r'^user/(?P<email>[\w\s.@\-]+)/?$', UserView.as_view(), name='user'),
     url(r'^user/(?P<email>[\w\s.@\-]+)/user_process/?$', user_process),