Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Sun, 6 Jul 2014 17:56:52 +0000 (19:56 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Sun, 6 Jul 2014 17:56:52 +0000 (19:56 +0200)
Conflicts:
portal/sliceresourceview.py


No differences found