merge
authorciro <ciro.scognamiglio@lip6.fr>
Tue, 21 Apr 2015 15:36:46 +0000 (17:36 +0200)
committerciro <ciro.scognamiglio@lip6.fr>
Tue, 21 Apr 2015 15:36:46 +0000 (17:36 +0200)
commitad016322ae3f21b27cda0e942fa48a10c3c728a3
tree34ebd5f625563dc3f31b4b59f68b5d6a26b810c9
parent9f80229afb54725f42b1e7420e898f3ea1bf176d
parentd3b9e64c03b27515bbaec94e34722cb1853f15ff
merge
portal/slicerequestview.py
portal/templates/fed4fire/fed4fire_projectrequest_view.html
portal/templates/slicerequest_view.html