diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
| commit | ca2a1d9f718a173a104fd08916ccbc6810d30e3b (patch) | |
| tree | e8c2da5569c0a02183c7194942d580e6a31614f4 /version.py | |
| parent | 8fb2f3099e0a8e90fab1be3d9f7055581ffdf89a (diff) | |
| parent | 2401a5a5a156c3189e556d5dc6a2b4491942f48e (diff) | |
| download | Ishtar-ca2a1d9f718a173a104fd08916ccbc6810d30e3b.tar.bz2 Ishtar-ca2a1d9f718a173a104fd08916ccbc6810d30e3b.zip | |
Merge branch 'master' into develop
Conflicts:
ishtar_common/views.py
version.py
Diffstat (limited to 'version.py')
| -rw-r--r-- | version.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/version.py b/version.py index cf55cff12..efadf2154 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ -# 1.99.0 -VERSION = (1, 99, 0) +# 1.99.1 +VERSION = (1, 99, 1) def get_version(): |