diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-24 20:53:20 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-24 20:53:20 +0100 |
| commit | 3c77ed9aa9b4f2c1f594f221eac9d7c03a4755be (patch) | |
| tree | 2b3ef83d4590584e643f85886b6a3a98bdf5d77e /chimere/admin.py | |
| parent | 5c29b59c93c73497af08ab96c1c356d54fd9d807 (diff) | |
| parent | 4e306ce4c5686c3741ba1dcf6a0c17ad6778f084 (diff) | |
| download | Chimère-3c77ed9aa9b4f2c1f594f221eac9d7c03a4755be.tar.bz2 Chimère-3c77ed9aa9b4f2c1f594f221eac9d7c03a4755be.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/static/chimere/css/styles.css
chimere/templates/chimere/blocks/areas.html
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions