diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-18 11:26:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-18 11:26:59 +0200 |
| commit | 6f29dd35427e04bdb309c7ac3fccb12843a9056c (patch) | |
| tree | 622eb5d94a30f472e8d5aa6f6933de9627d851cf /chimere/admin.py | |
| parent | 65bd0743a2ef44a638950f5c5cca4efa702bd89f (diff) | |
| parent | 57a43595d7ddb1e1581653eb8d2a71f3d2f192ab (diff) | |
| download | Chimère-6f29dd35427e04bdb309c7ac3fccb12843a9056c.tar.bz2 Chimère-6f29dd35427e04bdb309c7ac3fccb12843a9056c.zip | |
Merge branch 'v2.0'
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions