Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 28 Feb 2014 18:21:03 +0000 (19:21 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 28 Feb 2014 18:21:03 +0000 (19:21 +0100)
1  2 
myslice/urls.py

diff --cc myslice/urls.py
Simple merge