diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 01:20:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 01:20:56 +0200 |
| commit | 6b736e9d50b56ad9eee6735d10425e00e1c3f446 (patch) | |
| tree | 18c73e99e1395738657ef23541f6d78583e16b7a /ishtar_common/ooo_translation.py | |
| parent | 307520f3df65cf925609a4e66eb2628a198cabb5 (diff) | |
| parent | 353f779f15a2b3fbee066eb7a7151002f19e2256 (diff) | |
| download | Ishtar-6b736e9d50b56ad9eee6735d10425e00e1c3f446.tar.bz2 Ishtar-6b736e9d50b56ad9eee6735d10425e00e1c3f446.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