diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-27 01:55:08 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-27 01:55:08 +0100 |
| commit | 1da288964f2d2279339fd9224bd31831526f6e4d (patch) | |
| tree | dfd78897bd9e9b3b17a6f5e2cd02d719ed8c680d /example_project/settings.py | |
| parent | 3dca534692d18ba7bfc0db6c0e2ba4aedcaef2b0 (diff) | |
| parent | 403bb16d02db6aca31e63d1be147594dda28d703 (diff) | |
| download | Chimère-1da288964f2d2279339fd9224bd31831526f6e4d.tar.bz2 Chimère-1da288964f2d2279339fd9224bd31831526f6e4d.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions