Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorpierre <pierre.vigreux@lip6.fr>
Mon, 3 Mar 2014 14:36:00 +0000 (15:36 +0100)
committerpierre <pierre.vigreux@lip6.fr>
Mon, 3 Mar 2014 14:36:00 +0000 (15:36 +0100)
1  2 
portal/static/js/myslice-ui.js

Simple merge