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)
commiteefb371bb305430abf4cb867ed323759a7ad8535
treee92cce8c6e64d8506e4d5bf554b1e096b66926e7
parent74c5f604dbd061ad557764e5c5ce849c75bf5351
parentae7c7cb19456a8409703370ccbbf575954adbf50
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
myslice/urls.py