Merge branch 'onelab' of git://git.onelab.eu/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 7 Feb 2017 06:23:19 +0000 (07:23 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 7 Feb 2017 06:23:19 +0000 (07:23 +0100)
1  2 
myslice/urls.py

diff --cc myslice/urls.py
Simple merge