diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-16 12:40:36 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-16 12:40:36 +0200 |
| commit | 566ea4133f3085f7c55a3dd8b75dedceb2907a46 (patch) | |
| tree | 997a8be7fe879c15cefbcc47b4c46c10adbae848 /ishtar_common/ooo_translation.py | |
| parent | e78e539bee7b058e750dee2d15af2780159f2486 (diff) | |
| parent | a25d54c314692843a0086f6c7f9d38c30affce40 (diff) | |
| download | Ishtar-566ea4133f3085f7c55a3dd8b75dedceb2907a46.tar.bz2 Ishtar-566ea4133f3085f7c55a3dd8b75dedceb2907a46.zip | |
Merge branch 'master' into develop
Conflicts:
version.py
Diffstat (limited to 'ishtar_common/ooo_translation.py')
0 files changed, 0 insertions, 0 deletions