Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 20 Feb 2015 10:54:22 +0000 (11:54 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 20 Feb 2015 10:54:22 +0000 (11:54 +0100)
commit48478f20e4ee665d8d02b3caea9acf4a785be030
treefacb6a0b84e857574dd4a55336945d669f9a42a6
parent6949cc526323aca69ac4af7ded37bfe8c6ab07e6
parentcd7a1a959d36a2d87c4eee497cec92a952ba5dca
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/static/css/smartfire.css