diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-13 11:04:05 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:28 +0200 |
commit | 10cc60a91db55664641f335f372e3e5e04d31fe8 (patch) | |
tree | 721d5212b58a9925fe8517c5485c4629c3992e42 /version.py | |
parent | 239ff277af07ba55ebc186296d0621b557eaefa5 (diff) | |
download | Ishtar-10cc60a91db55664641f335f372e3e5e04d31fe8.tar.bz2 Ishtar-10cc60a91db55664641f335f372e3e5e04d31fe8.zip |
Fix bad merge
Diffstat (limited to 'version.py')
0 files changed, 0 insertions, 0 deletions