Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Tue, 15 Jul 2014 17:17:51 +0000 (19:17 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 15 Jul 2014 17:17:51 +0000 (19:17 +0200)
commit43da604014833e14325c327a0ea60c04bf112526
treeb984c92e83627cc01cb50325002a0f9caf84af71
parent02b8a108bb761cdb59ab7db29269a85c269a8c50
parent606581446b8e61b0817aefa81cbcc64df9cb21ed
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
myslice/urls.py