diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-20 21:13:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-20 21:13:28 +0100 |
| commit | 23426554f9106ea95f63095f6ca09441011e9d24 (patch) | |
| tree | cbbe909b9fa83d4780ab8d63384a4ffc72552158 /chimere/admin.py | |
| parent | ab63e22a65519a7d7fbdb074d4db10e21d889dc1 (diff) | |
| parent | a47acfb77d874e62e2d699ae792fbb77c5f8f61a (diff) | |
| download | Chimère-23426554f9106ea95f63095f6ca09441011e9d24.tar.bz2 Chimère-23426554f9106ea95f63095f6ca09441011e9d24.zip | |
Merge branch 'v2.1'
Conflicts:
chimere/templates/chimere/blocks/map.html
chimere/templatetags/chimere_tags.py
Diffstat (limited to 'chimere/admin.py')
0 files changed, 0 insertions, 0 deletions