diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 01:18:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 01:18:08 +0200 |
| commit | b94607e7e71fee4609d64e40fa778e3d4ab15062 (patch) | |
| tree | 295a06aba15c5fb6c38948930813a331ded4302c /ishtar_common/data_importer.py | |
| parent | bbe0dab46919eafdedf2ab115d6af0d8ba0f583c (diff) | |
| parent | bb315c1bba545929bd8777b8852d0fc380ce20e5 (diff) | |
| download | Ishtar-b94607e7e71fee4609d64e40fa778e3d4ab15062.tar.bz2 Ishtar-b94607e7e71fee4609d64e40fa778e3d4ab15062.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'ishtar_common/data_importer.py')
0 files changed, 0 insertions, 0 deletions