diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-03 16:30:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-03 16:30:56 +0200 |
| commit | 48e17845578ddb1ffe37c1e3e79bf853feb350f9 (patch) | |
| tree | 054a239c3a91734835f92cc6573a8dd2ab90bb30 /chimere/admin.py | |
| parent | fcabee9942f6429819dd1b02c43683daea95ee73 (diff) | |
| parent | 2ffea8264374e56f543dc34e318d113fec41397d (diff) | |
| download | Chimère-48e17845578ddb1ffe37c1e3e79bf853feb350f9.tar.bz2 Chimère-48e17845578ddb1ffe37c1e3e79bf853feb350f9.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/models.py
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions