diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-04-19 21:14:52 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-04-19 21:14:52 +0200 |
| commit | c35ae925003cf8c2935c82227ade8cde543fb402 (patch) | |
| tree | 9e33c15a987ea8b3928fa746acc008f65f35f87f /example_project/settings.py | |
| parent | cb4c402417f7ae6a69c0ab92673a0863318a6dce (diff) | |
| parent | 752e7defdf66464ad9addef1bd691d929f49df96 (diff) | |
| download | Chimère-c35ae925003cf8c2935c82227ade8cde543fb402.tar.bz2 Chimère-c35ae925003cf8c2935c82227ade8cde543fb402.zip | |
Merge branch 'master' of ssh://daenerys.peacefrogs.net/var/local/git/chimere
Conflicts:
chimere/templates/chimere/blocks/submited.html
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions