Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 7 Jul 2014 15:31:19 +0000 (17:31 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 7 Jul 2014 15:31:19 +0000 (17:31 +0200)
commit4f924a3d5b8d6ca7cf022e15900369c7a0c4ce7e
tree230cfc06e91dd57e696691f5e896a7384ee0c849
parent893b3133f91a4ec8b9c17eca223147e50b647681
parent9801aaca21611c0cfe7a5f19b9df4ba6e5bc2894
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
plugins/filter_status/templates/filter_status.html
plugins/querytable/templates/querytable.html
portal/sliceresourceview.py