diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-27 01:47:59 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-27 01:47:59 +0100 |
| commit | 403bb16d02db6aca31e63d1be147594dda28d703 (patch) | |
| tree | c887121cd8077f67d5e05d1451eb3a8b0d7857ad /chimere/admin.py | |
| parent | cfea28d371c6dd46f59f8a73d1b56ac6ffe12cb8 (diff) | |
| parent | 1242868c7eb1cd9da6f4001e2e98d4369d24ba15 (diff) | |
| download | Chimère-403bb16d02db6aca31e63d1be147594dda28d703.tar.bz2 Chimère-403bb16d02db6aca31e63d1be147594dda28d703.zip | |
Merge branch 'v2.1' into v2.2
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions