diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
commit | 54b87741a26a2bd805ed32200b082ca07ee0e27d (patch) | |
tree | 70302bf14268e6374fb1faf0438db01e57db01ae /version.py | |
parent | 0ca23dab03f240b8e960b417aed4451c10b51402 (diff) | |
parent | ac1c36d915d54ad4bef873a313fe04e2935c1fad (diff) | |
download | Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.tar.bz2 Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.zip |
Merge branch 'master' into v0.9
Conflicts:
CHANGES.txt
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 c27f31a86..53a9cfd8a 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 96, 2) +VERSION = (0, 96, 3) def get_version(): |