Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 21 Feb 2014 13:30:30 +0000 (14:30 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 21 Feb 2014 13:30:30 +0000 (14:30 +0100)
commit48759e302cac75bf63a1e156603c29e96b704b13
tree257b116bfa312926bbd99c4b693f3a0b92997305
parent2ced2e2f8d42b02b58b713c51299361ba937c06b
parent03dfe4e173d4ff67c821e29e36e5b872c533a4f2
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/urls.py