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 | 03cfeb3bdfadb01b84c4324697b21c6bc289a6b4 (patch) | |
| tree | 997a8be7fe879c15cefbcc47b4c46c10adbae848 /install | |
| parent | a3b43ca1c735ee9ee5b6eafedc445343b81d2829 (diff) | |
| parent | 6bfe97502d468d49d03f4f9c5ad389ea3e4f1a5c (diff) | |
| download | Ishtar-03cfeb3bdfadb01b84c4324697b21c6bc289a6b4.tar.bz2 Ishtar-03cfeb3bdfadb01b84c4324697b21c6bc289a6b4.zip | |
Merge branch 'master' into develop
Conflicts:
version.py
Diffstat (limited to 'install')
0 files changed, 0 insertions, 0 deletions