diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:35:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:35:51 +0200 |
| commit | b1cde00a315cf6a9b591fa94c9229116b68cee95 (patch) | |
| tree | 63f4fab584f0cc4e4b38f19461800b532af98195 /install/local_settings.py.sample | |
| parent | 0c6578ca35d85afe10d01c1e739d015dfdc224e0 (diff) | |
| parent | b5e023a7ce198bc186c41f82729801893e642cd6 (diff) | |
| download | Ishtar-b1cde00a315cf6a9b591fa94c9229116b68cee95.tar.bz2 Ishtar-b1cde00a315cf6a9b591fa94c9229116b68cee95.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