summaryrefslogtreecommitdiff
path: root/chimere/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-09-18 23:41:43 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-09-18 23:41:43 +0200
commitf05839ea95da54cd09e7c6f47775e27649c6ca0a (patch)
tree13d478451622a3af778e5828b025c82fa2fd8df4 /chimere/admin.py
parent64dccb469cd9dccf2053e68d8b603c84252a959a (diff)
parent7a542e025c7478ba3bef0059e74e452cdf270358 (diff)
downloadChimère-f05839ea95da54cd09e7c6f47775e27649c6ca0a.tar.bz2
Chimère-f05839ea95da54cd09e7c6f47775e27649c6ca0a.zip
Merge branch 'master' into saclay
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions