Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 18:06:48 +0000 (19:06 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 18:06:48 +0000 (19:06 +0100)
commit6143e0e624058757d3479f26bdcc62d923848613
tree2ebf8ad8818b9db07e4b6e0e58bcd85cd097618f
parent6ab39495971266c673d9b46a1eb5e00ed36e3ab5
parenta7a8b4873584904e4434e3a9dd42382d9f1f67a4
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
myslice/settings.py