diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-31 17:21:07 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-31 17:21:07 +0200 |
commit | 52bbc1ef6d0cdee2c4782c1babcc3149c8a1d0d3 (patch) | |
tree | 80cc66fd0873fa45ef1279c5af5d26402e900772 /version.py | |
parent | 06e1eb1c8170b267d0afd7d10e8e47625bba09f1 (diff) | |
parent | 60868dff460e7b2995c3a15b3a6cfb8074857aeb (diff) | |
download | Ishtar-52bbc1ef6d0cdee2c4782c1babcc3149c8a1d0d3.tar.bz2 Ishtar-52bbc1ef6d0cdee2c4782c1babcc3149c8a1d0d3.zip |
Merge branch 'master' into develop
Diffstat (limited to 'version.py')
0 files changed, 0 insertions, 0 deletions