diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-26 01:05:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-10-26 01:06:33 +0200 |
| commit | 24f7e63baaf5a0e6dfa98caf93cf071228219fae (patch) | |
| tree | b7cf19dea49f1ca42a345c9bd1e5368ad35a7e51 /settings.py | |
| parent | c0d44f8666d8151ca73d47e2f713217a09a19f8e (diff) | |
| parent | 109b46d129216247e0ad2138981441705d603730 (diff) | |
| download | Chimère - projet Saclay-24f7e63baaf5a0e6dfa98caf93cf071228219fae.tar.bz2 Chimère - projet Saclay-24f7e63baaf5a0e6dfa98caf93cf071228219fae.zip | |
Merge branch 'v2.1' into saclay
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions