diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-18 20:11:55 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-18 20:11:55 +0100 |
| commit | fdf82c977f28d86c7d9352c11765461e6a15241c (patch) | |
| tree | b30f611843d51eea7e9289efc3cc5c7fba2c361f /chimere/scripts/upgrade.py | |
| parent | faf7d02a261f6c2eba6d9cc7e349c70641cacd8f (diff) | |
| parent | 7109b55069ba31317d2d5cd68819f5d179a88380 (diff) | |
| download | Chimère-fdf82c977f28d86c7d9352c11765461e6a15241c.tar.bz2 Chimère-fdf82c977f28d86c7d9352c11765461e6a15241c.zip | |
Merge branch 'v1.0'
Conflicts:
chimere/main/models.py
chimere/scripts/upgrade.py
docs/en/UPGRADE.t2t
Diffstat (limited to 'chimere/scripts/upgrade.py')
0 files changed, 0 insertions, 0 deletions