diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-19 19:03:50 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-19 19:03:50 +0200 |
| commit | ea424eb36b3adef831683ec354b3dbd7d6b853f9 (patch) | |
| tree | 31b6978a694d5233fe100fcc4390b8a4666972b9 /ishtar_common/ooo_translation.py | |
| parent | 927115ea5e23f30996b8f4f67ba13bf4f92dfb95 (diff) | |
| parent | bdb50e2e41e863ddf59676e0ce8b06cfaf96c237 (diff) | |
| download | Ishtar-ea424eb36b3adef831683ec354b3dbd7d6b853f9.tar.bz2 Ishtar-ea424eb36b3adef831683ec354b3dbd7d6b853f9.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/data_importer.py
Diffstat (limited to 'ishtar_common/ooo_translation.py')
0 files changed, 0 insertions, 0 deletions