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)
commit2a609a565beff7c90ff6f0118285ee4995c9d6f6
tree960faac501d1d7391cd1bc2ed99d4e3157acd973
parentef984dd40c0b33c8af3cc3da64499e3fac85de85
parent49d96d60d820e6d9b8434fa070470e39d5c08422
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/static/js/myslice-ui.js