diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-18 04:44:35 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-18 04:44:35 +0200 |
commit | d8fd8310ecc13561a89662eabdad92d5c3908206 (patch) | |
tree | ca006d9658f2acfc6c643317b3ce45225404b4e7 /setup.py | |
parent | deb558cfb82718cd0a719e98c1e78a67f444910e (diff) | |
parent | 044733418fd585a2037fef6136584cbc8d71d1af (diff) | |
download | Ishtar-d8fd8310ecc13561a89662eabdad92d5c3908206.tar.bz2 Ishtar-d8fd8310ecc13561a89662eabdad92d5c3908206.zip |
Merge branch 'master' into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions