Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 10:46:51 +0000 (11:46 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 10:46:51 +0000 (11:46 +0100)
commit36a55939d5f370f1ff2b6021796e31edad21d1ff
tree6524e43c43c57e2633eb0f3275efbc70533c584d
parent531af2374a179111d92877760e2b70e5f4e7ba61
parentbcbf670f15c16f3a26369f5498b9ebcadb496b72
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
myslice/settings.py
myslice/settings.py
myslice/urls.py