diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-09-19 08:16:55 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-09-19 08:16:55 +0200 |
| commit | 25c72bcd877868a0a00697c15fe68ca9e0002d66 (patch) | |
| tree | 8eeed05124b985cde07d68a801d56354e14187ff /chimere/admin.py | |
| parent | 533d8c6a23250960a804caf652cedd3b1ff7db63 (diff) | |
| parent | 3c779a01f8320bb833ed95eb871c20e988a4b026 (diff) | |
| download | Chimère-25c72bcd877868a0a00697c15fe68ca9e0002d66.tar.bz2 Chimère-25c72bcd877868a0a00697c15fe68ca9e0002d66.zip | |
Merge branch 'v2.1' into v2.2
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions