diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-29 11:37:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-29 11:37:22 +0200 |
| commit | 2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (patch) | |
| tree | 7c0a2cb3713941ae7abb51e7591bd5398ac277ed /version.py | |
| parent | 97545b37f75b5a7297b5788cef32edd08b295f9d (diff) | |
| parent | 9b773927aaf6549ff52c697cce8009f55b042be8 (diff) | |
| download | Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.tar.bz2 Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.zip | |
Merge branch 'master' into develop
Conflicts:
version.py
Diffstat (limited to 'version.py')
| -rw-r--r-- | version.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.py b/version.py index efadf2154..3f6b5cc62 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ # 1.99.1 -VERSION = (1, 99, 1) +VERSION = (1, 99, 1, 1) def get_version(): |