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)
1  2 
portal/urls.py

diff --cc portal/urls.py
Simple merge