Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin Rahman <loic.baron@lip6.fr>
Tue, 12 May 2015 13:10:33 +0000 (15:10 +0200)
committerYasin Rahman <loic.baron@lip6.fr>
Tue, 12 May 2015 13:10:33 +0000 (15:10 +0200)
commitd1b79fec3d01b9286b977b26efdca49bdb21566c
treea3260f9b0dd65c9c62a71861ccc8a35830baffb4
parentca0fa822b04a0e28f0e85f29e476cc7b6ecd70a6
parent0f2ff6be378ae9fd40a7e8182b7ca8585037b645
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
myslice/settings.py