From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 15 Jul 2014 17:17:51 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~57
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=43da604014833e14325c327a0ea60c04bf112526;p=myslice.git

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

43da604014833e14325c327a0ea60c04bf112526
diff --cc myslice/urls.py
index 32d343b8,1d0248cb..dacebded
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@@ -97,10 -95,9 +98,11 @@@ urls = 
      (r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
      #
      (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
+     (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
      #
      url(r'^register/?$', RegistrationView.as_view(), name='registration'),	
 +    url(r'^terms/?$', TermsView.as_view(), name='terms'),
 +    #
      url(r'^portal/', include('portal.urls')),
  
      # SLA