Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 19 Jun 2014 13:31:32 +0000 (15:31 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 19 Jun 2014 13:31:32 +0000 (15:31 +0200)
commit6e24f5c8289f13a60d28a86543e8a84db63f4426
treebd5134c75ecf9554f8b5c599f6b36861d1ee9ebd
parent1d7ba6eead7f29bbd612a4ca81d0ec47d62befe3
parenteb59dc6f822c0b3a6742ccfd25f7f4d39c5e12bd
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/slice-resource-view.html