diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:25:20 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:25:20 +0200 |
commit | 0c6578ca35d85afe10d01c1e739d015dfdc224e0 (patch) | |
tree | e989fe16e54578643d5f38702b2a87748d363ecd /install/local_settings.py.sample | |
parent | ba8cd9cb1fedfe5b1263ab09a49d1c0b3dcd834d (diff) | |
parent | 804f228fd98c17f48ef3dda3f0eb23fb8e61ec98 (diff) | |
download | Ishtar-0c6578ca35d85afe10d01c1e739d015dfdc224e0.tar.bz2 Ishtar-0c6578ca35d85afe10d01c1e739d015dfdc224e0.zip |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'install/local_settings.py.sample')
0 files changed, 0 insertions, 0 deletions