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)
1  2 
myslice/settings.py

Simple merge