summaryrefslogtreecommitdiff
path: root/version.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-29 17:47:02 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-29 17:47:02 +0100
commit46af1fc5f7d61d5bcfc516ba5fb645e5892a31a0 (patch)
tree2ecae8d0ce091985d6839784b9d4b406a6455632 /version.py
parent0e9d38a6ed4dce4c23e6dfc59869d9d652e6dcfa (diff)
parent36928455883bd9366afe8bbd0c48076866df5802 (diff)
downloadIshtar-46af1fc5f7d61d5bcfc516ba5fb645e5892a31a0.tar.bz2
Ishtar-46af1fc5f7d61d5bcfc516ba5fb645e5892a31a0.zip
Merge branch 'master' into v0.9
Conflicts: archaeological_warehouse/migrations/0020_generate_cache_lbl_for_containers.py
Diffstat (limited to 'version.py')
-rw-r--r--version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.py b/version.py
index 4cf114c57..8fb7392cc 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 5)
+VERSION = (0, 99, 6)
def get_version():