Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 15 Jan 2015 10:09:28 +0000 (11:09 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 15 Jan 2015 10:09:28 +0000 (11:09 +0100)
commit5369b2e117fef0073efb9b2690dcf86312518e52
tree96142c7078d6e7de01a5e168cd8581c79cd0a2be
parentfe9989408f034d3d5f26a4cc64425360866a97d1
parent8ab8c97ea4aecad8a74af3577115f4064dda362a
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
myslice/urls.py